gri 10.0.4 → 10.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f6caff192d9084e4f57b13c21748a5435ccc34
-  data.tar.gz: 3b2f35a3c8a3bf966785aafe696b72ecdd2072a9
+  metadata.gz: 18b74441643b4d4919d26663b826f09ed5e79342
+  data.tar.gz: eecd64dcd712c1f52a9bbfc7ff7b4c21a32557ad
 SHA512:
-  metadata.gz: 8a00998136184148ef1c1f5d5bf9d7b0a5632f41a0311291c5ff8644a90c5e35d357aa39ed62f0012cabbf9e6934f210018ec7abde60b84e9c958d812b69fc23
-  data.tar.gz: b38a0c029852ec10aed66f37c16e209355189b1c07427c406b45d672fb570f12e7f733766a6cdb869b114626c7ca1d81916ac5edfe70fb9de8f8fa2017a2ba98
+  metadata.gz: 6399065907869a2d48bac6d93dbf7b43f34782278a41b8f716d2599a84711b3c6fe852660d0dc78375dbaec570ab186b31dffcbb1adf1100e39d9ba365aacdca
+  data.tar.gz: 2efbd5d418c136348a4344dff121a4d2cd3d45e1cc215c455dc99efa9ba8cb5a72dd786689bca9c9a3c38771d9f8e731aa8a197ed0b2da828b988eecae549dda

data/lib/gri/fake_snmp.rb

@@ -88,6 +88,8 @@ module GRI
         [0x42, $1.to_i]
       when /^Counter64: (\d+)/
         [0x46, $1.to_i]
+      when /^IpAddress: ([\.\d]+)/
+        [0x40, $1]
       else
         nil
       end

data/lib/gri/plugin/docker_collector.rb

@@ -1,5 +1,14 @@
 if Object.const_defined? :RUBY_VERSION
 
+#GRI::DEFS.update 'docker'=>{
+#    :ds=>['inbytes.0,inoctet,DERIVE,MAX,AREA,#90f090,in,8',
+#      'outbytes.0,outoctet,DERIVE,MAX,LINE1,#0000ff,out,8',
+#    ],
+#    :list=>['Docker'],
+#    :prop=>{:name=>'_index'},
+#    :graph=>[['bps', 1000, [0, nil], /octet/]],
+#}
+
 begin
 
 require 'net/http'
@@ -17,13 +26,15 @@ module GRI
       host = @hostname || @host
       port = @options["docker-port"] || 2375
       port = port.to_i
+
+      puts "docker: #{host}:#{port}" if $debug
       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,
+            record = {'_host'=>host, '_time'=>now_i, '_interval'=>@interval,
               '_key'=>"num_docker_#{k}", 'num'=>h[k],
             }
             records.push record
@@ -42,7 +53,12 @@ module GRI
                 '_key'=>"docker_#{docker_hostname}"
               }
               for mkey, mvalues in metrics
-                for k, v in mvalues
+                if mkey == 'memory' or mkey == 'cpuacct'
+                  h = hflat mvalues
+                else
+                  h = mvalues
+                end
+                for k, v in h
                   record[k] = v
                 end
               end
@@ -56,6 +72,22 @@ module GRI
       @loop.detach self
     end
 
+    def hflat h
+      hh = {}
+      for k, v in h
+        if Hash === v
+          hh.update hflat(v)
+        elsif Array === v
+          v.each_with_index {|vv, ind|
+            hh["#{k}.#{ind}"] = vv
+          }
+        else
+          hh[k] = v
+        end
+      end
+      hh
+    end
+
     def get_container_info http, ctn_id
       if Net::HTTPSuccess === (res = http.get "/containers/#{ctn_id}/json")
         h = JSON.parse(res.body)

data/lib/gri/plugin/writer_influxdb.rb

@@ -29,6 +29,7 @@ module GRI
     def write records
       time = Time.now.to_i
       for record in records
+        record = record.dup
         time = record.delete '_time'
         #host = record.delete '_host'
         key = record.delete '_key'
@@ -38,6 +39,8 @@ module GRI
         next if data_name == 'SYS'
         if data_name == ''
           data_name = 'interfaces'
+        elsif data_name == 'docker'
+          data_name = "docker.#{index}"
         end
         record.update :time=>time.to_i, :key=>index
         buffered_write data_name, record

data/lib/gri/version.rb

@@ -1,3 +1,3 @@
 module GRI
-  VERSION = "10.0.4"
+  VERSION = "10.0.5"
 end

data/misc/Dockerfile

@@ -1,4 +1,4 @@
-FROM centos
+FROM centos:centos6
 
 # cron
 RUN yum install -y cronie
@@ -13,7 +13,7 @@ RUN gem install gri --no-ri --no-rdoc
 RUN cp /usr/bin/grapher /var/www/cgi-bin/
 
 # rrdtool
-RUN yum install -y cairo gettext pango tcp_wrappers-libs libdbi
+RUN yum install -y wget cairo gettext pango tcp_wrappers-libs libdbi
 RUN yum install -y xorg-x11-fonts-Type1 ipa-gothic-fonts ipa-pgothic-fonts
 RUN (cd /tmp; wget http://pkgs.repoforge.org/rrdtool/rrdtool-1.4.7-1.el6.rfx.x86_64.rpm)
 RUN (cd /tmp; rpm --nodeps -i rrdtool-1.4.7-1.el6.rfx.x86_64.rpm)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gri
 version: !ruby/object:Gem::Version
-  version: 10.0.4
+  version: 10.0.5
 platform: ruby
 authors:
 - maebashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack