gri 10.0.1 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eb6644b6a0c8a97bfc6bb59bdbcb67dfc3db587
-  data.tar.gz: 5a686fa5f77d255b4a9d4632639445ce95b08d55
+  metadata.gz: d6ecf4515540adbc206c6edd80231b70ae252abf
+  data.tar.gz: e7137b4e6f903dc85815c59fe8af4cca4f23bdd8
 SHA512:
-  metadata.gz: 1510485c0bd6cedfc980ea7d1b13752a20135127c2a771593f5f61009caed1452ce4f291ca2e6ca66b0b629e26b3ff91f5e7f3235073bb2b318f4b2a9f85d178
-  data.tar.gz: a647d54ebf6b8084c0b6018da050f646826336d43b6c0c58d2b3ff4fd86faeffdfd92797a7a9ea68aa5a09bec2ae7ff6d5ef66b0a59c40a0cc9f5370398459b4
+  metadata.gz: 94603ec74475e84a731143d4331db05cfebbbcdad39c845ef24f0ffc0449645f5ab0a70eec151d529918815d11c12d6d199908b2040d56f9bc0efccd1a6998cd
+  data.tar.gz: c1458666f2d7d3735048471232f26649287cf62dd3c538328e89b78ca0c02cd611503e5bc3c5e984261589391567d8e9350add60818a8d0e488b36f32588cb72

data/.drone.yml

@@ -0,0 +1,7 @@
+image: bradrydzewski/ruby:2.0.0
+env:
+  - TZ=Asia/Tokyo
+script:
+  - sudo apt-get install rrdtool
+  - bundle install
+  - bundle exec rake test

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/gri.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "gri/version"
 
@@ -15,7 +14,6 @@ Gem::Specification.new do |s|
 ) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-
+  s.add_development_dependency "msgpack"
   s.add_runtime_dependency "rack"
 end

data/lib/gri/builtindefs.rb

@@ -24,6 +24,8 @@ module GRI
         'ifInUcastPkts', 'ifOutUcastPkts',
         'ifInNUcastPkts', 'ifOutNUcastPkts',],
       :index_key => 'ifDescr',
+      :ignore? => proc {|record|
+        /(^(Loopback|Null|Async)\d+)|cef layer|atm subif/ === record['ifDescr']},
       :exclude? => proc {|record|
         record['ifOperStatus'].to_i != 1 or
           record['ifSpeed'].to_i == 0 or
@@ -154,6 +156,8 @@ module GRI
 
     'hrStorage'=>{
       :oid=>['hrStorageEntry'],
+      :exclude? => proc {|record| record['hrStorageDescr'] =~ /devicemapper/},
+      :hidden? => proc {|record| record['hrStorageDescr'] =~ /devicemapper/},
       :tdb=>['hrStorage', 'hrStorageDescr', 'hrStorageSize', 'hrStorageUsed'],
       :fix_workhash=>lambda {|wh|
         if (h = wh[:hrStorage])
@@ -175,6 +179,22 @@ module GRI
       :composite=>['s', 'v', 't'],
     },
 
+    'hrSWRunPerf'=>{
+      :puclass=>'HRSWRunPerf',
+      :oid=>['hrSWRunPath', 'hrSWRunParameters',
+        'hrSWRunPerfCPU', 'hrSWRunPerfMem'],
+      :tdb=>['hrSWRunPerf', 'name', 'hrSWRunPerfCPU', 'hrSWRunPerfMem'],
+      :ds=>['hrSWRunPerfMem,mem,GAUGE,MAX,AREA,#40ff40',
+        'hrSWRunPerfCPU,cputime,DERIVE,MAX,LINE1,#4444ff,,300',],
+      :prop=>{:name=>'hrSWRunPerfMatched',
+        :lastvalue=>'hrSWRunPerfMem', :cputime=>'hrSWRunPerfCPU'},
+      :list=>['RunPerf', '%N,%1024L\r'],
+      :composite=>['s', 'v', 't'],
+      :graph=>[['mem', 1024, nil, /mem/],
+        ['centisecond', 0, [0, nil], /cputime/]
+      ],
+    },
+
     :term => {
       :default=>[['Daily', 30*3600], ['Weekly', 8*24*3600],
         ['Monthly', 31*24*3600], ['Yearly', 365*24*3600]],
@@ -194,12 +214,17 @@ module GRI
         @specs = {}
         for k, dhash in self
           next unless String === k
-          data_name = dhash[:data_name] || dhash[:cat] ||
+          data_name = dhash[:data_name] || dhash[:cat] || dhash[:pucat] ||
             (dhash[:tdb] and dhash[:tdb].first) ||
             k.gsub(/-/, '')
           spec = (@specs[data_name.to_s] ||= {})
+          if dhash[:tdb]
+            dhash[:tdb] = dhash[:tdb].map {|item|
+              (item =~ /\s+\*\s+/) ? Regexp.last_match.pre_match : item
+            }
+          end
           [:list, :index_key, :named_index, :tdb, :ds, :rra, :prop,
-            :graph, :composite, :exclude?, :hidden?].each {|symkey|
+            :graph, :composite, :ignore?, :exclude?, :hidden?].each {|symkey|
             spec[symkey] = dhash[symkey] if dhash[symkey]
           }
           spec[:list] ||= dhash[:list_text] #XXX

data/lib/gri/collector.rb

@@ -1,5 +1,6 @@
 #require 'gri/utils'
 require 'gri/msnmp'
+require 'gri/builtindefs'
 require 'gri/vendor'
 require 'gri/polling_unit'
 
@@ -77,8 +78,13 @@ module GRI
       @tout = 5
       @preq = nil
       @snmp = SNMP.new(@cname || @host, options['port'])
-      @snmp.version = options['ver'] if options['ver']
-      @snmp.community = options['community'] if options['community']
+      if options['fake-snmp']
+        require 'gri/fake_snmp'
+        @snmp = FakeSNMP.new options['fake-snmp']
+      else
+        @snmp.version = options['ver'] if options['ver']
+        @snmp.community = options['community'] if options['community']
+      end
 
       varbind = SYSOIDS
       get(varbind) {|results|
@@ -90,7 +96,11 @@ module GRI
         sysinfo['sysDescr'] and sysinfo['sysDescr'].gsub!("\n", ' ')
 
         vendor = Vendor.check sysinfo, options
-        puts "snmp: #{host} (#{vendor.name}): #{vendor.options.inspect}" if $debug
+        if $debug
+          puts "snmp: #{host} (#{vendor.name}): #{sysinfo['sysDescr']}"
+          puts vendor.options.inspect
+        end
+
         @snmp.version = vendor.options['ver'] if vendor.options['ver']
         punits = vendor.get_punits
         punits_d = punits.dup
@@ -105,7 +115,12 @@ module GRI
           hfdh = @fake_descr_hash[host]
 
           @workhash[:interfaces] = @workhash[''] #
+          if $debug and ($debug['workhash'] or $debug['workhash0'])
+            puts "  workhash0"
+            show_workhash @workhash
+          end
           for pu in punits_d
+            pu.options = vendor.options
             join_cat, join_key = pu.defs[:join]
             if join_cat
               for cat, wh in @workhash[pu.cat]
@@ -115,13 +130,22 @@ module GRI
                 end
               end
             end
+            puts "  fix_workhash #{pu.class} #{pu.name}" if $debug
             pu.fix_workhash @workhash
           end
           @workhash.delete :interfaces #
+          if $debug and ($debug['workhash'] or $debug['workhash1'])
+            puts "  workhash1"
+            show_workhash @workhash
+          end
 
           for cat, wh in @workhash
-            (specs = DEFS.get_specs cat) and
+            if (specs = DEFS.get_specs cat)
               (index_key = specs[:index_key] || specs[:named_index])
+            else
+              specs = {}
+            end
+            ign_proc = specs[:ignore?]
             for ind, h in wh
               h['_host'] = @hostname || host
               h['_key'] = if index_key
@@ -140,7 +164,7 @@ module GRI
                   (prop = specs[:prop]) and (descr_k = prop[:description])
                 h[descr_k] = f_descr
               end
-              puts "  record #{h.inspect}" if h['_d']
+              next if ign_proc and ign_proc.call(h)
               records.push h
             end
           end
@@ -164,9 +188,9 @@ module GRI
         cb.call
       else
         pu = punits.shift
-        puts "  poll #{host} #{pu.name}" if $debug
         @get_oid_buf = []
         oids = pu.oids.dup
+        puts "  poll #{host} #{pu.name}" if $debug
         walk1(pu, oids) {poll1 punits, &cb}
       end
     end
@@ -189,6 +213,7 @@ module GRI
           walk1 pu, oids, &cb
         else
           walk(req_enoid) {|results|
+            show_results req_enoid, results if $debug and $debug['walk']
             results.each {|enoid, tag, val| pu.feed wh, enoid, tag, val}
             walk1 pu, oids, &cb
           }
@@ -196,6 +221,28 @@ module GRI
       end
     end
 
+    def show_workhash workhash
+      for cat, wh in workhash
+        puts "    cat: #{cat.inspect}"
+        for ind, h in wh
+          puts "      index: #{ind}"
+          for k, v in h
+            puts "        #{k}: #{v.inspect}"
+          end
+        end
+      end
+    end
+
+    def show_results req_enoid, results
+      puts "    req #{SNMP.enoid2name req_enoid}"
+      for enoid, tag, val in results
+        a = BER.dec_oid enoid
+        s = a[0..-2].join('.')
+        oid_ind = BER.enc_v_oid s
+        puts "      res #{SNMP.enoid2name(enoid)} #{tag} #{val.inspect}"
+      end
+    end
+
     def walk enoid, &cb
       @results.clear
       @retry_count = 0
@@ -224,12 +271,15 @@ module GRI
 
     def send_req arg
       @preq = [@snmp.state, arg]
-      s = @snmp.make_req @snmp.state, arg
-      if @retry_count > 0
-        Log.debug "retry send_req, #{@buffers.size}"
+      if (s = @snmp.make_req(@snmp.state, arg))
+        if @retry_count > 0
+          Log.debug "retry send_req, #{@buffers.size}"
+        end
+        @buffers.push s
+        loop.watch @snmp.sock, :w, @tout, self
+      else
+        on_readable
       end
-      @buffers.push s
-      loop.watch @snmp.sock, :w, @tout, self
     end
 
     def retry

data/lib/gri/fake_snmp.rb

@@ -0,0 +1,96 @@
+module GRI
+  class FakeSock
+    def recv *arg; end
+  end
+
+  class FakeSNMP
+    attr_reader :state
+    attr_accessor :version
+
+    def initialize path
+      lines = File.readlines path
+      @lines = []
+      lines.each {|line|
+        oid, value = line.split ' = '
+        value = vconv value
+        enoid = BER.enc_v_oid oid[1..-1]
+        @lines.push [enoid, value] if value
+      }
+
+      @sock = FakeSock.new
+
+      @roids = SNMP::ROIDS
+      @state = :IDLE
+    end
+
+    def get_value enoid
+      (res = @lines.assoc enoid) ? res[1] : nil
+    end
+
+    def sock; @sock; end
+
+    def recv_msg msg
+      for arg in @get_buf
+        @cb.call *arg
+      end
+      @get_buf.clear
+      @state = :SUCCESS
+      nil
+    end
+
+    def get_start msg, &cb
+      @cb = cb
+      @state = :GET_REQ
+      @get_buf = []
+      tag, msg, = BER.tlv msg
+      while msg.size > 0
+        tag, val, msg = BER.tlv msg
+        if val.getbyte(0) == 6
+          len = val.getbyte(1)
+          enoid = val[2, len]
+          if (value = get_value(enoid))
+            @get_buf.push [enoid, value[0], value[1]]
+          end
+        end
+      end
+    end
+
+    def walk_start enoid, &cb
+      @cb = cb
+      @state = :GETBULK_REQ
+
+      @get_buf = []
+      for k, v in @lines
+        if k.index(enoid) == 0
+          @get_buf.push [k, v[0], v[1]]
+        end
+      end
+    end
+
+    def make_req state, arg
+      nil
+    end
+
+    def vconv str
+      case str
+      when /^INTEGER: (?:\w+\()?([-\d]+)/
+        [0x02, $1.to_i]
+      when /^STRING: "(.*)/
+        [0x04, $1[0..-2]]
+      when /^STRING: ([^"].*)/
+        [0x04, $1]
+      when /^OID: \.(1.*)/
+        enoid = BER.enc_v_oid $1
+        [0x06, enoid]
+      when /^Counter(?:32)?: (\d+)/
+        [0x41, $1.to_i]
+      when /^Gauge(?:\d+): ([-\d]+)/
+        [0x42, $1.to_i]
+      when /^Counter64: (\d+)/
+        [0x46, $1.to_i]
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/gri/graph.rb

@@ -213,7 +213,7 @@ module GRI
       rrdpaths, total_ub = get_rrdpaths_and_ub rnames
 
       args = []
-      if total_ub > 0
+      if total_ub > 0 and (params['p'] != 'v')
         args.push "-u #{total_ub} --alt-autoscale-max" if params['y'] == 'u'
         args.push "HRULE:#{total_ub}#ff0000"
       end

data/lib/gri/grapher.rb

@@ -14,9 +14,9 @@ module GRI
     def initialize
       root_dir = Config['root-dir'] ||= Config::ROOT_PATH
       log_dir = Config['log-dir'] || Config['root-dir'] + '/log'
-      Log.init "#{log_dir}/#{File.basename $0}.log"
+      Log.init "#{log_dir}/#{File.basename $0}.log", :no_dash=>true
     rescue SystemCallError
-      Log.init '/tmp/grapher.log'
+      Log.init '/tmp/grapher.log', :no_dash=>true
     end
 
     def call env

data/lib/gri/ldb.rb

@@ -32,6 +32,7 @@ module GRI
         if vymd >= ymd
           rtime = Time.local(vymd[0, 4], vymd[4, 2], vymd[6, 2])
           open(ymd_file, 'rb') {|f|
+            pos = 0 if f.stat.size < pos
             f.pos = pos
             while line = f.gets
               pos += line.size

data/lib/gri/list.rb

@@ -74,7 +74,7 @@ module GRI
       sysdb = {}
       for dir in dirs
         values = LTSV.load_from_file(dir + '/.sysdb/sysdb.txt')
-        values.inject(sysdb) {|h, v| h[v['_host']] = v; h}
+        values.inject(sysdb) {|h, v| v['_host'] and (h[v['_host']] = v); h}
       end
       sysdb
     end

data/lib/gri/log.rb

@@ -36,7 +36,7 @@ module Log
     shift_size = options[:log_shift_size] || 100_000_000
     logger = Logger.new logdev, shift_age, shift_size
     logger.formatter = Log::Formatter.new
-    logger.add Logger::INFO, '-'
+    logger.add Logger::INFO, '-' unless options[:no_dash]
     logger = Logger.new logdev
     logger.formatter = Log::Formatter.new
     logger.level = {'fatal'=>Logger::FATAL, 'error'=>Logger::ERROR,

data/lib/gri/main.rb

@@ -30,9 +30,12 @@ module GRI
       GRI::Plugin.load_plugins plugin_dirs, @config
 
       log_dir = @config['log-dir'] || root_dir + '/log'
-      Dir.mkdir log_dir unless File.exist? log_dir
-      Log.init "#{log_dir}/#{optparser.program_name}.log",
-        :log_level=>@config['log-level']
+      begin
+        Dir.mkdir log_dir unless File.exist? log_dir
+        Log.init "#{log_dir}/#{optparser.program_name}.log",
+          :log_level=>@config['log-level']
+      rescue SystemCallError
+      end
 
       @config['tra-dir'] ||= root_dir + '/tra'
       @config['gra-dir'] ||= root_dir + '/gra'
@@ -78,15 +81,17 @@ module GRI
 
     def optparse opts
       op = OptionParser.new
-      op.on('--debug') {$debug = true; STDOUT.sync = true;
+      op.on('--debug [FLAGS]', String) {|arg| STDOUT.sync = true
+        a = (arg || '').split(/,/)
+        $debug = Hash[*(a.zip([true]*a.size).flatten)]
         opts['log-level'] = 'debug'}
-      op.on('--Doption=STR') {|arg| (opts['Doption'] ||= []).push arg}
 
       op.on('--add-writer=WRITER') {|arg| (opts['writers'] ||= []).push arg}
       op.on('-O OPT_STR') {|arg| (opts['O'] ||= []).push arg}
       op.on('--collector') {opts['collector'] = true}
       op.on('--config-path=PATH') {|arg| opts[:config_path] = arg}
       op.on('--duration=SEC', Integer) {|arg| opts['duration'] = arg}
+      op.on('--fake-snmp=FILE') {|arg| opts['fake_snmp'] = arg}
       op.on('--gritab-path=PATH') {|arg| opts['gritab-path'] = arg}
       op.on('--host-pat=PAT', '-h') {|arg| (opts['host-pat'] ||= []).push arg}
       op.on('--interval=SEC', Integer) {|arg| opts['interval'] = arg}

data/lib/gri/msnmp.rb

@@ -471,6 +471,9 @@ class SNMP
   end
 
   def enoid2name enoid
+    SNMP.enoid2name enoid
+  end
+  def self.enoid2name enoid
     a = BER.dec_oid enoid
     n = a.size
     n0 = n

data/lib/gri/plugin.rb

@@ -4,8 +4,7 @@ module GRI
 
     def load_plugins dirs=[], config=nil
       @loaded = {}
-      dirs += get_gem_dirs
-      dirs.push File.join(File.dirname(__FILE__), 'plugin')
+      dirs = [File.join(File.dirname(__FILE__), 'plugin')] + get_gem_dirs + dirs
       dirs.each {|dir| load_plugin_dir dir, config}
     end
 
@@ -49,13 +48,14 @@ module GRI
         if defined?(::Gem::Specification) and
             Gem::Specification.respond_to?(:find_all)
           specs = Gem::Specification.find_all {|spec|
-            spec.full_require_paths.map {|path|
-              File.directory?(path + '/gri/plugin')}.any?
+            spec.require_paths.map {|path|
+              File.directory?("#{spec.gem_dir}/#{path}/gri/plugin")}.any?
           }.sort_by {|spec| spec.version}.reverse
           names = {}
           specs.each {|spec| names[spec.name] ||= spec}
           names.values.each {|spec|
-            dirs += spec.full_require_paths.map {|path| path + '/gri/plugin'}
+            dirs += spec.require_paths.map {|path|
+              "#{spec.gem_dir}/#{path}/gri/plugin"}
           }
         elsif Gem.respond_to?(:searcher)
           specs = Gem.searcher.find_all 'gri/plugin/*.rb'

data/lib/gri/plugin/bootstrap.rb

@@ -16,8 +16,8 @@ background:linear-gradient(to bottom, #ffd8d8 0%,#ffcccc 45%,#ffc0c0 100%);
 text-align:left;}
 hr {border:none;border-top:1px #cccccc solid;}
 </style>
-<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
-<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
+<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
+<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap-theme.min.css">
 </head>
 
 <body>
@@ -34,9 +34,9 @@ hr {border:none;border-top:1px #cccccc solid;}
 <%= yield %>
 </div>
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js">
 </script>
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
 </body>
 </html>
 EOS

data/lib/gri/plugin/ucdavis.rb

@@ -86,6 +86,8 @@ GRI::DEFS.update 'ucd-la'=>{:cat=>:l,
 },
   'ucd-dsk'=>{:cat=>:disk,
   :oid=>['dskEntry'],
+  :exclude? => proc {|record| record['dskPath'] =~ /devicemapper/},
+  :hidden? => proc {|record| record['dskPath'] =~ /devicemapper/},
   :tdb=>['d', 'dskPath', 'dskTotal', 'dskUsed', 'dskDevice'],
   :fix_workhash=>proc {|wh|
     for k, r in wh[:disk]
@@ -126,6 +128,12 @@ GRI::DEFS.update 'ucd-la'=>{:cat=>:l,
   'ucd-diskio'=>{:cat=>:diskio, :puclass=>'UCDDiskIO',
   :oid=>['diskIODevice', 'diskIOReads', 'diskIOWrites',
     'diskIONReadX', 'diskIONWrittenX'],
+  :ignore? => proc {|record|
+    record['diskIODevice'] =~ /^(diskIODevice|loop|ram|dm-)/ or
+      !(record['diskIODevice'])},
+  #:exclude? => proc {|record| record['diskIODevice'] =~ /^(loop|ram|dm-)/},
+  :hidden? => proc {|record|
+    record['diskIODevice'] =~ /^(diskIODevice|loop|ram|dm-)/},
   :tdb=>['diskIO', 'diskIODevice', 'diskIOReads', 'diskIOWrites',
     'diskIONReadX', 'diskIONWrittenX'],
   :ds=>['diskIOReads,reads,DERIVE,MAX,AREA,#90f090',

data/lib/gri/polling_unit.rb

@@ -3,7 +3,7 @@ module GRI
     UNITS = {}
 
     attr_reader :name, :cat, :oids
-    attr_accessor :dhash
+    attr_accessor :dhash, :ophash, :options
     alias :defs :dhash
 
     def self.all_units
@@ -12,15 +12,25 @@ module GRI
           next unless String === name
           pucat = dhash[:cat] || dhash[:pucat] ||
             (dhash[:tdb] and dhash[:tdb].first.intern) || name.intern
-          puclass = dhash[:puclass]
-          if puclass and Object.const_defined?(puclass + 'PollingUnit')
-            klass = eval(puclass + 'PollingUnit')
-          else
-            klass = self
+          klass = self
+          if (puclass = dhash[:puclass])
+            if GRI.const_defined?("#{puclass}PollingUnit") or 
+                Object.const_defined?("#{puclass}PollingUnit")
+              klass = eval("#{puclass}PollingUnit")
+            end
           end
           pu = klass.new name, pucat
           pu.dhash = dhash
           pu.set_oids dhash[:oid]
+          if dhash[:tdb]
+            dhash[:tdb].each {|item|
+              if item =~ /\s+\*\s+/
+                pre = Regexp.last_match.pre_match
+                post = Regexp.last_match.post_match
+                (pu.ophash ||= {})[pre] = proc {|val| val * post.to_f}
+              end
+            }
+          end
 
           self::UNITS[name] = pu
         end
@@ -31,6 +41,8 @@ module GRI
     def initialize name, cat
       @name = name
       @cat = cat
+      @options = {}
+      @ophash = nil
       @d_p = false
     end
 
@@ -43,7 +55,6 @@ module GRI
 
     def feed wh, enoid, tag, val
       if (feed_proc = dhash[:feed])
-        puts "  feed_proc #{[enid, tag, val].inspect}" if @d_p
         feed_proc.call wh, enoid, tag, val
       else
         if enoid.getbyte(-2) < 128
@@ -66,11 +77,10 @@ module GRI
         if (sym_oid = SNMP::ROIDS[oid_ind])
           (conv_val_proc = dhash[:conv_val]) and
             (val = conv_val_proc.call(sym_oid, val))
-          (wh[ind] ||= {})[sym_oid] = val
-          if @d_p
-            wh[ind]['_d'] = true
-            puts "  feed #{[sym_oid, ind, tag, val].inspect}"
+          if ophash and (pr = ophash[sym_oid])
+            val = pr.call(val)
           end
+          (wh[ind] ||= {})[sym_oid] = val
         end
       end
     end
@@ -85,4 +95,29 @@ module GRI
       "#<PU:#{@name}>"
     end
   end
+
+  class HRSWRunPerfPollingUnit < PollingUnit
+    def fix_workhash workhash
+      re = (pat = options['hrSWRunPerf']) ? Regexp.new(pat) : nil
+      wh2 = {}
+      if (wh = workhash[:hrSWRunPerf])
+        del_keys = []
+        for k, v in wh
+          sw = "#{v['hrSWRunPath']} #{v['hrSWRunParameters']}"
+          if re =~ sw
+            matched = $&
+            idx = matched.gsub(/[\s\/]/, '_').gsub(/[^\w]/, '') #/
+            h = (wh2[idx] ||= {})
+            h['hrSWRunPerfMatched'] = matched
+            h['hrSWRunPerfMem'] ||= 0
+            h['hrSWRunPerfMem'] += v['hrSWRunPerfMem'].to_i * 1024
+            h['hrSWRunPerfCPU'] ||= 0
+            h['hrSWRunPerfCPU'] += v['hrSWRunPerfCPU'].to_i
+          end
+        end
+        workhash[:hrSWRunPerf] = wh2
+      end
+      super
+    end
+  end
 end

data/lib/gri/scheduler.rb

@@ -24,6 +24,7 @@ module GRI
     end
 
     def process1 col_type, host, options
+      return if Config['nop']
       collector = Collector.create(col_type, host, options,
                                    @fake_descr_hash) {|records|
         for writer in @writers

data/lib/gri/spark.rb

@@ -80,7 +80,6 @@ module GRI
       op = OptionParser.new
       op.on('--debug') {$debug = true; STDOUT.sync = true;
         opts['log-level'] = 'debug'}
-      op.on('--Doption=STR') {|arg| (opts['Doption'] ||= []).push arg}
       op.on('-O OPT_STR') {|arg| (opts['O'] ||= []).push arg}
       op.on('-c', '--config-path=PATH') {|arg| opts[:config_path] = arg}
       op.on('--log-level=LEVEL') {|arg| opts['log-level'] = arg}

data/lib/gri/updater.rb

@@ -147,7 +147,6 @@ module GRI
       end
       data = @record_keys.map {|key| record[key]}
       s = "#{time.to_i}:#{mk_update_str data}"
-      puts "  update #{@key} #{s}" if record['_d']
       @rrd.buffered_update s
 
       if (prop = @specs[:prop]) and (descr_k = prop[:description]) and

data/lib/gri/vendor.rb

@@ -25,7 +25,7 @@ module GRI
         }
       end
       vdefs ||= {:name=>'unknown'}
-      Vendor.new vdefs, sysinfo, options
+      self.new vdefs, sysinfo, options
     end
 
     def initialize vdefs, sysinfo, options

data/lib/gri/version.rb

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

data/test/fake_snmp.txt

@@ -0,0 +1,52 @@
+.1.3.6.1.2.1.1.1.0 = STRING: Linux HOSTNAME.example.com 2.6.18
+.1.3.6.1.2.1.1.2.0 = OID: .1.3.6.1.4.1.8072.3.2.10
+.1.3.6.1.2.1.1.5.0 = STRING: HOSTNAME.example.com
+.1.3.6.1.2.1.2.1.0 = INTEGER: 3
+.1.3.6.1.2.1.2.2.1.1.1 = INTEGER: 1
+.1.3.6.1.2.1.2.2.1.1.2 = INTEGER: 2
+.1.3.6.1.2.1.2.2.1.1.3 = INTEGER: 3
+.1.3.6.1.2.1.2.2.1.2.1 = STRING: lo
+.1.3.6.1.2.1.2.2.1.2.2 = STRING: eth0
+.1.3.6.1.2.1.2.2.1.2.3 = STRING: eth1
+.1.3.6.1.2.1.2.2.1.4.1 = INTEGER: 16436
+.1.3.6.1.2.1.2.2.1.4.2 = INTEGER: 1500
+.1.3.6.1.2.1.2.2.1.4.3 = INTEGER: 1500
+.1.3.6.1.2.1.2.2.1.5.1 = Gauge32: 10000000
+.1.3.6.1.2.1.2.2.1.5.2 = Gauge32: 1000000000
+.1.3.6.1.2.1.2.2.1.5.3 = Gauge32: 10000000
+.1.3.6.1.2.1.2.2.1.7.1 = INTEGER: up(1)
+.1.3.6.1.2.1.2.2.1.7.2 = INTEGER: up(1)
+.1.3.6.1.2.1.2.2.1.7.3 = INTEGER: down(2)
+.1.3.6.1.2.1.2.2.1.8.1 = INTEGER: up(1)
+.1.3.6.1.2.1.2.2.1.8.2 = INTEGER: up(1)
+.1.3.6.1.2.1.2.2.1.8.3 = INTEGER: down(2)
+.1.3.6.1.2.1.2.2.1.10.1 = Counter32: 415914156
+.1.3.6.1.2.1.2.2.1.10.2 = Counter32: 493985280
+.1.3.6.1.2.1.2.2.1.10.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.11.1 = Counter32: 6057806
+.1.3.6.1.2.1.2.2.1.11.2 = Counter32: 39093162
+.1.3.6.1.2.1.2.2.1.11.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.12.1 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.12.2 = Counter32: 97254
+.1.3.6.1.2.1.2.2.1.12.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.13.1 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.13.2 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.13.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.14.1 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.14.2 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.14.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.16.1 = Counter32: 315914156
+.1.3.6.1.2.1.2.2.1.16.2 = Counter32: 2789307653
+.1.3.6.1.2.1.2.2.1.16.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.17.1 = Counter32: 6057806
+.1.3.6.1.2.1.2.2.1.17.2 = Counter32: 22196084
+.1.3.6.1.2.1.2.2.1.17.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.18.1 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.18.2 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.18.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.19.1 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.19.2 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.19.3 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.20.1 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.20.2 = Counter32: 0
+.1.3.6.1.2.1.2.2.1.20.3 = Counter32: 0

data/test/test_builtindefs.rb

@@ -11,7 +11,7 @@ class TestBuiltinDEFS < Test::Unit::TestCase
   def setup
   end
 
-  def test_get_spec
+  def test_get_specs
     specs = DEFS.get_specs 'num'
     ae '_index', specs[:prop][:name]
     ae 4, specs[:rra].size
@@ -19,6 +19,15 @@ class TestBuiltinDEFS < Test::Unit::TestCase
     ae 'ifInOctets,inoctet,DERIVE,MAX,AREA,#90f090,in,8', specs[:ds].first
     specs = DEFS.get_specs :l
   end
+
+  def test_get_specs_foo
+    specs = DEFS.get_specs :foo
+    assert_nil specs
+    DEFS.instance_eval {@specs = nil}
+    DEFS['foo'] = {:tdb=>['foo', 'xx * 10', 'yy', 'zz']}
+    specs = DEFS.get_specs :foo
+    ae ['foo', 'xx', 'yy', 'zz'], specs[:tdb]
+  end
 end
 
 end

data/test/test_collector.rb

@@ -27,7 +27,7 @@ class TestCollector < Test::Unit::TestCase
     "\x7F\xC9i\xA10\"\x06\b+\x06\x01\x02\x01\x01\x06\x00" +
     "\x04\x16xxxxx xxxx, xxxxx xxx."
 
-  def test_snmp_collecotr
+  def test_snmp_collector
     c = Collector.create('snmp', 'testhost', {}) {|records|}
     snmp = MockSNMP.new 'testhost'
     c.instance_eval {
@@ -53,6 +53,20 @@ class TestCollector < Test::Unit::TestCase
     c.walk(enoid) {|enoid, tag, val|}
     ae :GETNEXT_REQ, snmp.state
   end
+
+  def test_snmp_collector_fake_snmp
+    opts = {'fake-snmp'=>File.join($test_dir, 'fake_snmp.txt')}
+    records = nil
+    c = Collector.create('snmp', 'testhost', opts) {|rs| records = rs}
+    c.attach MockLoop.new
+
+    sys = records.detect {|r| r['_key'] == 'SYS'}
+    ae 'HOSTNAME.example.com', sys['sysName']
+
+    eth0 = records.detect {|r| r['ifDescr'] == 'eth0'}
+    ae '_eth0', eth0['_key']
+    ae 1000000000, eth0['ifSpeed']
+  end
 end
 
 end

data/test/test_polling_unit.rb

@@ -54,5 +54,24 @@ module GRI
       pu.fix_workhash workhash
       ae '192.168.0.1/255.255.255.0', wh[2]['ipaddr']
     end
+
+    def test_polling_unit_ophash
+      DEFS['foo'] = {:tdb=>['foo', 'fooX * 10', 'fooY', 'fooZ']}
+      PollingUnit::UNITS.clear
+      units = PollingUnit.all_units
+      pu = units['foo']
+      ae 50, pu.ophash['fooX'].call(5).to_i
+      assert_nil pu.ophash['fooY']
+
+      wh = {}
+      SNMP.update 'fooEntry'=>'1.3.6.1.4.1.99999.1',
+        'fooX'=>'1.3.6.1.4.1.99999.1.1'
+      SNMP::ROIDS.clear
+      SNMP.new 'host'
+      enoid = BER.enc_v_oid(SNMP::OIDS['fooX'] + '.1')
+      pu.feed wh, enoid, 2, 3
+      r = wh[1]
+      ae 30, r['fooX'].to_i
+    end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gri
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.0.2
 platform: ruby
 authors:
 - maebashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -37,7 +51,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".drone.yml"
 - ".gitignore"
+- Gemfile
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
@@ -61,6 +77,7 @@ files:
 - lib/gri/collector.rb
 - lib/gri/config.rb
 - lib/gri/ds_list.rb
+- lib/gri/fake_snmp.rb
 - lib/gri/format_helper.rb
 - lib/gri/gparams.rb
 - lib/gri/graph.rb
@@ -103,6 +120,7 @@ files:
 - lib/gri/writer.rb
 - mcollector
 - misc/Dockerfile
+- test/fake_snmp.txt
 - test/mock.rb
 - test/root/gra/.sysdb/sysdb.txt
 - test/root/gra/testhost/.records.txt
@@ -162,11 +180,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: GRI
 test_files:
+- test/fake_snmp.txt
 - test/mock.rb
 - test/root/gra/.sysdb/sysdb.txt
 - test/root/gra/testhost/.records.txt