gri 10.0.7 → 10.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f65c5971ca81e3e40bb99b6c75fc9cb0e7abd13
-  data.tar.gz: 13ec94a6ae74dd7b05e54466df5549083dfd7c8b
+  metadata.gz: 19492a2ad3e4e1ec3c1e2f2f42de8cb962a3e591
+  data.tar.gz: 2c8951bbe68e3a24e8c1a3dbe5b024806f850a6d
 SHA512:
-  metadata.gz: 961ec77bab123aba5882cc937722d62d8b9cfa6a18245b6b1664f5a90e4a0c26a30d63df7620340e88a1aceebb904f549f115d72fa5f60dfc14a113514659289
-  data.tar.gz: 80fdba8a08010d7d33fcc7247b0bd820fb83e7f6d440baf545ff8234e26391a80baff675c75b7d78dfb4dd132f29c9fdb70dc17b9cd8e0d12ad18b435faa23ed
+  metadata.gz: 3f7b436519f3f84d94227d01a7ba9be89e9f1436614d191e9d2fe1360629b824a69fe5d6c0293314df1ffcf891c5411c4bc477ee5ced3506e2e3c23c279cbf6b
+  data.tar.gz: 01218f858aeefd19b5b83433072ee66cafdd7d19ed91b27716df8323d6319043df7f66c5d3bf879545d6847ad6cfcfe7980fec4455ef951bf619ede6c1a2901e

data/lib/gri/builtindefs.rb

@@ -9,6 +9,13 @@ module GRI
       :graph=>[['', 0]],
       :composite=>['', 's', 'v', 't'],
     },
+    'counter'=>{
+      :ds=>['num,num,DERIVE,,,,:index'],
+      :prop=>{:name=>'_index', :description=>'description'},
+      :list=>['Counter', '%N'],
+      :graph=>[['', 0, [0, nil]]],
+      :composite=>['', 's', 'v', 't'],
+    },
     'grimetrics'=>{:ds=>['number,number,GAUGE'],
       :prop=>{:name=>'_index'},
       :list_text=>['grimetrics', '%N,%L\r'],
@@ -163,13 +170,24 @@ module GRI
       :hidden? => proc {|record| record['hrStorageDescr'] =~ /devicemapper/},
       :tdb=>['hrStorage', 'hrStorageDescr', 'hrStorageSize', 'hrStorageUsed'],
       :fix_workhash=>lambda {|wh|
+        if (th = wh[:hrStorageTotalHack])
+          ph = Hash[*(th.map {|k, v|
+                        [v['dskPath'],
+                          (v['dskTotalHigh'].to_i * 4294967296 +
+                           v['dskTotalLow'].to_i) * 1024]
+                      }).flatten]
+        end
         if (h = wh[:hrStorage])
           h.reject! {|k, v|
             v['hrStorageType'] != "+\x06\x01\x02\x01\x19\x02\x01\x04"}
           h.each {|k, v|
             u = v['hrStorageAllocationUnits'].to_i
             v.delete 'hrStorageType'
-            v['hrStorageSize'] = v['hrStorageSize'].to_i * u
+            if ph and (t = ph[v['hrStorageDescr']])
+              v['hrStorageSize'] = t
+            else
+              v['hrStorageSize'] = v['hrStorageSize'].to_i * u
+            end
             v['hrStorageUsed'] = v['hrStorageUsed'].to_i * u
           }
         end
@@ -182,6 +200,10 @@ module GRI
       :composite=>['s', 'v', 't'],
     },
 
+    'hrStorageTotalHack'=>{
+      :oid=>['dskPath', 'dskTotalLow', 'dskTotalHigh'],
+    },
+
     'hrSWRunPerf'=>{
       :puclass=>'HRSWRunPerf',
       :oid=>['hrSWRunPath', 'hrSWRunParameters',

data/lib/gri/gparams.rb

@@ -27,9 +27,8 @@ module GRI
     end
 
     def update hash
-      hash.each {|key, value|
-        @params[key] = [value]
-      }
+      hash.each {|key, value| @params[key] = [value]}
+      self
     end
 
     def merge cgi_params

data/lib/gri/msnmp.rb

@@ -369,7 +369,6 @@ class SNMP
     'hrSystemNumUsers'=>'1.3.6.1.2.1.25.1.5.0',
     'hrSystemProcesses'=>'1.3.6.1.2.1.25.1.6.0',
     'hrSystemMaxProcesses'=>'1.3.6.1.2.1.25.1.7.0',
-    'hrSystem'=>'1.3.6.1.2.1.25.1',
     'hrStorage'=>'1.3.6.1.2.1.25.2',
     'hrStorageTypes'=>'1.3.6.1.2.1.25.2.1',
     'hrStorageFixedDisk'=>'1.3.6.1.2.1.25.2.1.4',

data/lib/gri/utils.rb

@@ -5,8 +5,12 @@ module GRI
     module_function
 
     def load_records dir
-      values = LTSV.load_from_file dir + '/.records.txt'
-      values.inject({}) {|h, v| h[v['_key']] = v; h}
+      if File.exist?(path = dir + '/.records.txt')
+        values = LTSV.load_from_file path
+        values.inject({}) {|h, v| h[v['_key']] = v; h}
+      else
+        nil
+      end
     end
 
     def search_records dirs, host

data/lib/gri/version.rb

@@ -1,3 +1,3 @@
 module GRI
-  VERSION = "10.0.7"
+  VERSION = "10.0.8"
 end

data/lib/gri/writer.rb

@@ -8,7 +8,12 @@ module GRI
       if (klass = TYPES[wtype])
         options.select {|k, v| String === k}.each {|k, v|
           options[k.gsub('-', '_').intern] = v}
-        klass.new options
+        begin
+          klass.new options
+        rescue
+          Log.error "Writer.create error: #{$!}"
+          nil
+        end
       end
     end
 

data/test/test_graph.rb

@@ -22,11 +22,11 @@ class TestGraph < Test::Unit::TestCase
     gra_dirs = [@root_dir + '/gra']
     rs = ['testhost__eth0']
     graph = Graph.new :dirs=>gra_dirs
-    params = {}
+    params = GParams.new
     res = graph.mk_graph_title rs, params
     assert_nil res
 
-    params = {'p'=>'t'}
+    params.update 'p'=>'t'
     res = graph.mk_graph_title rs, params
     ae '"testhost eth0 testdescr"', res
   end

data/test/test_page.rb

@@ -13,16 +13,24 @@ class TestPage < Test::Unit::TestCase
 
   def test_page_mk_page_title
     rs = ['testhost__eth0']
-    res = @page.mk_page_title([@root_dir + '/gra'], rs, {})
+    params = GParams.new
+    res = @page.mk_page_title([@root_dir + '/gra'], rs, params)
     ae 3, res.size
     ae 'testdescr', res[0]
     assert_match(/__eth0/, res[1])
     assert_match(/ eth0/, res[2])
+
+    rs = []
+    params.update 'grp'=>'foo', 'tag'=>'foo_bar'
+    res = @page.mk_page_title([@root_dir + '/gra'], rs, params)
+    ae 3, res.size
+    ae 'foo_bar', res[0]
+    ae 'foo_bar', res[1]
   end
 
   def test_page_mk_param_str
     rs = ['r0.example.com', 'r 1?']
-    params = {}
+    params = GParams.new
     assert_match /\br=r\+1%3F/, @page.mk_param_str(0, 0, rs, nil, params)
   end
 
@@ -30,7 +38,7 @@ class TestPage < Test::Unit::TestCase
     stime = Time.local(2013,10,1)
     etime = stime + 24*3600
     rs = ['testhost__eth0']
-    params = {'p'=>'s'}
+    params = GParams.new.update 'p'=>'s'
     res = @page.mk_graph_tag stime, etime, rs, params
     ae 2, res.scan(/inoctet/).size
     ae 2, res.scan(/indiscard/).size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gri
 version: !ruby/object:Gem::Version
-  version: 10.0.7
+  version: 10.0.8
 platform: ruby
 authors:
 - maebashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: GRI