gri 10.0.2 → 10.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6ecf4515540adbc206c6edd80231b70ae252abf
-  data.tar.gz: e7137b4e6f903dc85815c59fe8af4cca4f23bdd8
+  metadata.gz: abd70d1091e31de3ab3f392bc49cf25bd7359752
+  data.tar.gz: 4e2b0060b88f9ee99fe4735b707e950526f297ea
 SHA512:
-  metadata.gz: 94603ec74475e84a731143d4331db05cfebbbcdad39c845ef24f0ffc0449645f5ab0a70eec151d529918815d11c12d6d199908b2040d56f9bc0efccd1a6998cd
-  data.tar.gz: c1458666f2d7d3735048471232f26649287cf62dd3c538328e89b78ca0c02cd611503e5bc3c5e984261589391567d8e9350add60818a8d0e488b36f32588cb72
+  metadata.gz: 1464140edec6d228c6c64b2b8634c322dd6f1c9723b586550cfb70b3c1d778441628fb1b64aa629a4a67a8220585ef2e037e6940a3a6755237f511ed6be8eec4
+  data.tar.gz: d3a55bcf25504742047ca129a67f3cff38754c986c5942f881523425ea1a18af4457c2ef55950d231bd3c861a185edd270e7bd8b0d82f2c29a159cd4bed9b773

data/lib/gri/app_collector.rb

@@ -121,7 +121,7 @@ module GRI
     def get_targets_from_lines lines, config
       targets = Config.get_targets_from_lines lines
       goptions = Config.parse_options(*(config.getvar 'option'))
-      goptions.merge!(Config.parse_options(*config['O']))
+      goptions.merge!(Config.parse_options(*config.getvar('O')))
       if config['host-pat']
         hosts_re = config.getvar('host-pat').map {|h| Regexp.new h}
         targets = targets.select {|host, | hosts_re.detect {|re| re === host}}

data/lib/gri/builtindefs.rb

@@ -59,14 +59,17 @@ module GRI
       :composite=>['s', 'v', 't'],
     },
     'ifMIB'=>{:cat=>'',
-      :oid=>['ifHCInOctets', 'ifHCOutOctets', 'ifHighSpeed', 'ifAlias'],
-      :fix_workhash=>proc {|wh|
+      :oid=>['ifName', 'ifHCInOctets', 'ifHCOutOctets', 'ifHighSpeed', 'ifAlias'],
+      :fix_workhash=>proc {|wh, options|
         for k, r in wh['']
           r['ifInOctets'] = r['ifHCInOctets'] if r['ifHCInOctets']
           r['ifOutOctets'] = r['ifHCOutOctets'] if r['ifHCOutOctets']
           if r['ifHighSpeed'] and r['ifHighSpeed'].to_i > 4000
             r['ifSpeed'] = r['ifHighSpeed'].to_i * 1_000_000
           end
+          if options['ifname'] and r['ifName']
+            r['ifDescr'] = r['ifName']
+          end
         end
       },
     },
@@ -84,7 +87,7 @@ module GRI
       :fix_workhash => lambda {|wh|
         ifrecord = wh[''] || {}
         for k, record in wh[:ipaddr]
-          a = k + '/' + record['mask']
+          a = k + '/' + (record['mask'] || '?')
           ind = record['ifIndex']
           if (r = ifrecord[ind])
             if r['ipaddr']

data/lib/gri/main.rb

@@ -26,9 +26,6 @@ module GRI
       @options.each {|k, v| @config.setvar k.to_s, v}
       root_dir = @config['root-dir'] ||= Config::ROOT_PATH
 
-      plugin_dirs = @config.getvar('plugin-dir') || [root_dir + '/plugin']
-      GRI::Plugin.load_plugins plugin_dirs, @config
-
       log_dir = @config['log-dir'] || root_dir + '/log'
       begin
         Dir.mkdir log_dir unless File.exist? log_dir
@@ -37,6 +34,9 @@ module GRI
       rescue SystemCallError
       end
 
+      plugin_dirs = @config.getvar('plugin-dir') || [root_dir + '/plugin']
+      GRI::Plugin.load_plugins plugin_dirs, @config
+
       @config['tra-dir'] ||= root_dir + '/tra'
       @config['gra-dir'] ||= root_dir + '/gra'
     end

data/lib/gri/plugin.rb

@@ -15,7 +15,12 @@ module GRI
       files.each {|fname|
         unless @loaded[fname]
           path = File.join dir, fname
-          require path
+          begin
+            require path
+          rescue LoadError
+            Log.error "LoadError: #{$!}"
+            puts "LoadError: #{$!}" if $debug
+          end
           @loaded[fname] = path
         end
       }

data/lib/gri/plugin/docker_collector.rb

@@ -0,0 +1,72 @@
+if Object.const_defined? :RUBY_VERSION
+
+begin
+
+require 'net/http'
+require 'json'
+require 'gri/collector'
+
+module GRI
+  class DockerCollector < Collector
+    TYPES['docker'] = self
+
+    def on_attach
+      now_i = Time.now.to_i
+
+      records = []
+      host = @hostname || @host
+      port = @options["docker-port"] || 2375
+      port = port.to_i
+      Net::HTTP.start(host, port) {|http|
+        res = http.get '/info'
+        if Net::HTTPSuccess === res
+          h = JSON.parse(res.body)
+          for k in ['Containers', 'Images',
+              'NEventsListener', 'NFd', 'NGoroutines']
+            record = {'_host'=>host, '_time'=>now_i,
+              '_key'=>"num_docker_#{k}", 'num'=>h[k],
+            }
+            records.push record
+          end
+        end
+
+        res = http.get '/containers/json'
+        if Net::HTTPSuccess === res
+          a = JSON.parse(res.body)
+          for c in a
+            if (cinfo = get_container_info(http, c['Id']))
+              docker_hostname = cinfo['Config']['Hostname']
+              docker_image = cinfo['Config']['Image']
+              metrics = cinfo['Metrics']
+              record = {'_host'=>host, '_time'=>now_i, '_interval'=>@interval,
+                '_key'=>"docker_#{docker_hostname}"
+              }
+              for mkey, mvalues in metrics
+                for k, v in mvalues
+                  record[k] = v
+                end
+              end
+              records.push record
+            end
+          end
+        end
+      }
+
+      @cb.call records
+      @loop.detach self
+    end
+
+    def get_container_info http, ctn_id
+      if Net::HTTPSuccess === (res = http.get "/containers/#{ctn_id}/json")
+        h = JSON.parse(res.body)
+        return h if h and h['Metrics']
+      end
+      nil
+    end
+  end
+end
+
+rescue LoadError
+end
+
+end

data/lib/gri/plugin/suppress_veth.rb

@@ -0,0 +1,15 @@
+GRI::DEFS['interfaces'].update :ignore? => proc {|record|
+  /(^(|Loopback|Null|Async)\d+)|(^veth\w)|cef layer|atm subif/ ===
+    record['ifDescr']
+},
+  :exclude? => proc {|record|
+  record['ifOperStatus'].to_i != 1 or
+    record['ifSpeed'].to_i == 0 or
+    (Integer(record['ifInOctets']) == 0 and
+     Integer(record['ifOutOctets']) == 0) or
+    /(^(|Loopback|Null|Async|lo)\d+)|(^veth\w)|cef layer|atm subif/ ===
+    record['ifDescr']
+},
+  :hidden? => proc {|record|
+  /(^veth\w)|cef layer|atm subif|unrouted.VLAN/ === record['ifDescr']
+}

data/lib/gri/plugin/writer_influxdb.rb

@@ -0,0 +1,66 @@
+require 'gri/writer'
+require 'gri/utils'
+require 'influxdb'
+
+module GRI
+  class InfluxdbWriter < Writer
+    TYPES['influxdb'] = self
+
+    include Utils
+
+    def initialize options={}
+      @options = options
+      database = 'gri'
+      host = options[:influxdb_host] || 'localhost'
+      username = options[:influxdb_username] || 'root'
+      password = options[:influxdb_password] || 'root'
+
+      @db = InfluxDB::Client.new database, :host=>host,
+        :username=>username, :password=>password,
+        :time_precision=>'s'
+      dbs = @db.get_database_list
+      if (dbs.select {|h| h['name'] == 'gri'}).empty?
+        Log.info 'InfluxDB: create database'
+        @db.create_database 'gri'
+      end
+      @buf = {}
+    end
+
+    def write records
+      time = Time.now.to_i
+      for record in records
+        time = record.delete '_time'
+        #host = record.delete '_host'
+        key = record.delete '_key'
+        record.delete '_mtime'
+        record.delete '_interval'
+        data_name, index = parse_key key
+        next if data_name == 'SYS'
+        if data_name == ''
+          data_name = 'interfaces'
+        end
+        record.update :time=>time.to_i, :key=>index
+        buffered_write data_name, record
+      end
+    end
+
+    def buffered_write data_name, record
+      (ary = (@buf[data_name] ||= [])).push record
+      if ary.size > 1000
+        flush data_name, ary
+      end
+    end
+
+    def flush data_name, ary
+      while (sa = ary.take 10000; ary[0, 10000] = []; !sa.empty?)
+        @db.write_point data_name, sa
+      end
+    end
+
+    def finalize
+      for data_name, ary in @buf
+        flush data_name, ary
+      end
+    end
+  end
+end

data/lib/gri/polling_unit.rb

@@ -87,7 +87,11 @@ module GRI
 
     def fix_workhash workhash
       if (c = dhash[:fix_workhash])
-        c.call workhash
+        if c.arity == 1
+          c.call workhash
+        elsif c.arity == 2
+          c.call workhash, @options
+        end
       end
     end
 

data/lib/gri/scheduler.rb

@@ -45,6 +45,7 @@ module GRI
           @loop.attach collector
         rescue SystemCallError
           Log.error "#{host}: ERROR: #{$!}"
+          puts "#{host}: ERROR: #{$!}" if $debug
           @loop.detach collector
         end
         @metrics[:run_count] += 1

data/lib/gri/version.rb

@@ -1,3 +1,3 @@
 module GRI
-  VERSION = "10.0.2"
+  VERSION = "10.0.3"
 end

data/test/test_docker_collector.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/unittest_helper')
+
+require 'mock'
+require 'gri/plugin/docker_collector'
+
+module GRI
+
+class MockDockerCollector < DockerCollector
+end
+
+class TestDockerCollector < Test::Unit::TestCase
+  def _test_docker_collector
+    Collector::TYPES['docker'] = MockDockerCollector
+
+    host = 'dockerhost'
+    options = {'type'=>'docker'}
+    records = []
+    collector = Collector.create(options['type'], host, options) {|rs|
+      records += rs
+    }
+    assert_kind_of DockerCollector, collector
+
+    s = '{"GitCommit":"28ff62e/0.7.9","GoVersion":"go1.2","KernelVersion":"2.6.32-999.9.abc.x86_64","Version":"0.7.9"}'
+    collector.on_read s + "\n"
+
+  end
+end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gri
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 10.0.3
 platform: ruby
 authors:
 - maebashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -96,11 +96,14 @@ files:
 - lib/gri/plugin.rb
 - lib/gri/plugin/bootstrap.rb
 - lib/gri/plugin/cisco.rb
+- lib/gri/plugin/docker_collector.rb
 - lib/gri/plugin/exec_collector.rb
 - lib/gri/plugin/juniper.rb
 - lib/gri/plugin/netsnmp.rb
+- lib/gri/plugin/suppress_veth.rb
 - lib/gri/plugin/ucdavis.rb
 - lib/gri/plugin/writer_fluentd.rb
+- lib/gri/plugin/writer_influxdb.rb
 - lib/gri/polling_unit.rb
 - lib/gri/q.rb
 - lib/gri/request.rb
@@ -133,6 +136,7 @@ files:
 - test/test_builtindefs.rb
 - test/test_collector.rb
 - test/test_config.rb
+- test/test_docker_collector.rb
 - test/test_ds_list.rb
 - test/test_exec_collector.rb
 - test/test_format_helper.rb
@@ -198,6 +202,7 @@ test_files:
 - test/test_builtindefs.rb
 - test/test_collector.rb
 - test/test_config.rb
+- test/test_docker_collector.rb
 - test/test_ds_list.rb
 - test/test_exec_collector.rb
 - test/test_format_helper.rb