onering-report 0.6.12 → 0.6.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGE1ZjdkZmVjMTdlZDk2MWJkYjQ2NDBmMTI4ZTNiZmUwOGQ3YTFiNQ==
+    MmNiYjNjOGJiYWI1M2U0NzkwMDE3OTkyY2RjODFmMTNhYTI4NzRhZA==
   data.tar.gz: !binary |-
-    ZjUyZDhlNTZjODE5ZTY2YmI5Y2IyYWU5NTJhNjVmMGExYWM3ZWNhNA==
+    ZmE5ZWU1ZDRlODk2NzRkMzgxM2JjMjRiMWNmMDA1OGEwYTJmOTUwNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTI3MjY2YzUxYmFiMzg1ZGRhN2FlOTI1N2MxNzg0NjAxYjEyNzNmYmY1N2Uw
-    NWNiMmEyYTdjM2FlNWZhNTRhNTgwM2Y1Zjg3MTlkNzFmMjhmNzM5YjI4OWU0
-    NWQ4NGNlOTA5NjkyNWRhM2I4MWZjMGY2NDUyYmY4YWE0ODIwNjY=
+    ZjBkY2UwZjE4NTQ5NDRiZGUzN2JjNmZmMmZhMTBiY2IwMjE0OTM2ZjBmNzY3
+    ZmE0NjRlZGYwNjFlMmNiZjcyN2E5NmIyNGU3YzRmNjRlNDJlNzc5ZmM2ODI2
+    YTgxOWU3YTg0ZTg4ZWViZjdhMTRhZjlkOGNjZTRiYzRmYThlZGY=
   data.tar.gz: !binary |-
-    NjQyMWEyZjQ0NDI0YTJjMWMyYTU0YzZiMDI4M2EyNTQyZmE2NDg5NmU2ODdk
-    ZTRkMzQyODAzYWMxMjM1ODFlMjk1YmE0M2M1NGJjOTE0NzdiMjc3NTA4NzUz
-    YjhiY2U0MjdiNTFmYWI5Mzk4OGVhNzFjN2QwMmEyZmZmMDQ2YTQ=
+    NDExMzZiYjQzOGFhNzBhZmVlODkwNWE2ZTg3Njk4NDE4Yjg0OTc1YzczOTAw
+    MmMyYWI4ZGJhZmYxMjEzMjcyYTExZTZhYzI3ODRjZmRjNDk3MjRhYTA4ZmRl
+    OTM0N2VkNTUyZGNjMTkwMWJhZGFmMDc0ZDFjNTRlNWJmYzkwNjg=

data/lib/facter/onering_properties_physical.rb

@@ -85,9 +85,8 @@ end
   end
 
   if ipmi_ok?
-    ipmi_lan = nil
-    with_timeout do
-     ipmi_lan = Facter::Util::Resolution.exec("ipmitool lan print 1 2> /dev/null")
+    ipmi_lan = with_timeout do
+      Facter::Util::Resolution.exec("ipmitool lan print 1 2> /dev/null")
     end
 
     if ipmi_lan

data/onering-report.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = 'onering-report'
-  gem.version       = '0.6.12'
+  gem.version       = '0.6.13'
   gem.authors       = ['rnarkis']
   gem.email         = ['rnarkis@outbrain.com']
   gem.description   = %q{Onering facter facts}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onering-report
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - rnarkis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onering-agent
@@ -72,7 +72,6 @@ files:
 - lib/facter/onering_properties_chef.rb
 - lib/facter/onering_properties_haproxy.rb
 - lib/facter/onering_properties_id.rb
-- lib/facter/onering_properties_netstat.rb
 - lib/facter/onering_properties_network.rb
 - lib/facter/onering_properties_onering.rb
 - lib/facter/onering_properties_openvz.rb

data/lib/facter/onering_properties_netstat.rb

@@ -1,94 +0,0 @@
-require 'resolv'
-
-protocols = %w{tcp tcp6 udp udp6}
-
-flags = "--numeric-hosts --numeric-ports --programs --tcp --udp -ee"
-
-case Facter.value('osfamily').to_s.downcase
-when 'debian' then flags += " -W"
-when 'redhat' then flags += " -T"
-end
-
-listening = Facter::Util::Resolution.exec("nice -n 19 netstat #{flags} -l | tr -s ' ' | sed 's/ LISTEN//g'")
-#nonlistening = Facter::Util::Resolution.exec("nice -n 19 netstat #{flags} | tr -s ' '")
-
-# netstat = {
-#   'listening'    => [],
-#   'connections'  => []
-# }
-
-netstat = {
-  'listening'    => []
-}
-
-def getcommandline(pid)
-  return nil unless pid.to_i > 0
-  (File.read("/proc/#{pid}/cmdline").to_s.strip.chomp.squeeze("\u0000").squeeze("\0").gsub("\u0000", ' ').gsub("\0", ' '))
-end
-
-[*listening.to_s.lines.to_a[2..-1]].each do |line|
-  protocol, recvq, sendq, local, foreign, user, inode, program = line.split(' ', 8)
-
-  next unless protocols.include?(protocol)
-
-  local = local.split(':')
-  foreign = foreign.split(':')
-  local_host = local[-2]
-  local_port = local[-1]
-  foreign_host = foreign[-2]
-  foreign_port = foreign[-1]
-  pid = program.split('/').first
-
-  command = getcommandline(pid)
-  next if command.nil?
-
-  netstat['listening'] << {
-    "protocol" => protocol,
-    "address"  => local_host,
-    "fqdn"     => (Resolv.getname(local_host) rescue nil),
-    "port"     => local_port.to_i,
-    "user"     => user,
-    "program"  => {
-      "pid"     => pid.to_i,
-      "command" => getcommandline(pid)
-    }
-  }
-end
-
-# nonlistening.lines.to_a[2..-1].each do |line|
-#   protocol, recvq, sendq, local, foreign, state, user, inode, program = line.split(' ', 9)
-#   next unless protocols.include?(protocol)
-
-#   local = local.split(':')
-#   foreign = foreign.split(':')
-#   local_host = local[-2]
-#   local_port = local[-1]
-#   foreign_host = foreign[-2]
-#   foreign_port = foreign[-1]
-#   pid = program.split('/').first
-
-#   netstat['connections'] << {
-#     "protocol" => protocol,
-#     "from" => {
-#       "address" => local_host,
-#       "port"    => local_port.to_i
-#     },
-#     "to" => {
-#       "address" => foreign_host,
-#       "fqdn"    => (Resolv.getname(foreign_host) rescue nil),
-#       "port"    => foreign_port.to_i
-#     },
-#     "user"  => user,
-#     "state" => state.downcase,
-#     "program" => {
-#       "pid"     => pid.to_i,
-#       "command" => getcommandline(pid)
-#     }
-#   }
-# end
-
-Facter.add("netstat") do
-  setcode do
-    netstat
-  end
-end