facter 1.5.8 → 1.5.9

data/lib/facter/util/memory.rb

@@ -50,5 +50,48 @@ module Facter::Memory
 
         return "%.2f %s" % [size, s]
     end
+
+    def self.vmstat_find_free_memory()
+        row = Facter::Util::Resolution.exec('vmstat').split("\n")[-1]
+        if row =~ /^\s*\d+\s*\d+\s*\d+\s*\d+\s*(\d+)/
+            Facter.add("MemoryFree") do
+                memfree = $1
+                setcode do
+                    Facter::Memory.scale_number(memfree.to_f, "kB")
+                end
+            end
+        end
+    end
+
+    # Darwin had to be different. It's generally opaque with how much RAM it is
+    # using, and this figure could be improved upon too I fear.
+    # Parses the output of "vm_stat", takes the pages free & pages speculative
+    # and multiples that by the page size (also given in output). Ties in with
+    # what activity monitor outputs for free memory.
+    def self.vmstat_darwin_find_free_memory()
+
+        memfree = 0
+        pagesize = 0
+        memspecfree = 0
+
+        vmstats = Facter::Util::Resolution.exec('vm_stat')
+        vmstats.each do |vmline|
+          case
+            when vmline =~ /page\ssize\sof\s(\d+)\sbytes/
+              pagesize = $1.to_i
+            when vmline =~ /^Pages\sfree:\s+(\d+)\./
+              memfree = $1.to_i
+            when vmline =~ /^Pages\sspeculative:\s+(\d+)\./
+              memspecfree = $1.to_i
+          end
+        end
+
+        freemem = ( memfree + memspecfree ) * pagesize
+        Facter.add("MemoryFree") do
+          setcode do
+            Facter::Memory.scale_number(freemem.to_f, "")
+          end
+        end
+    end
 end
 

data/lib/facter/util/netmask.rb

@@ -17,7 +17,7 @@ module Facter::NetMask
                 :regex => %r{\s+ inet \s #{Facter.ipaddress} \s netmask \s (\w{8})}x,
                 :munge => Proc.new { |mask| mask.scan(/../).collect do |byte| byte.to_i(16) end.join('.') }
             }
-        when 'FreeBSD','NetBSD','OpenBSD', 'Darwin'
+        when 'FreeBSD','NetBSD','OpenBSD', 'Darwin', 'GNU/kFreeBSD'
             ops = {
                 :ifconfig => '/sbin/ifconfig -a',
                 :regex => %r{\s+ inet \s #{Facter.ipaddress} \s netmask \s 0x(\w{8})}x,

data/lib/facter/util/resolution.rb

@@ -135,6 +135,9 @@ class Facter::Util::Resolution
     def value
         result = nil
         return result if @code == nil and @interpreter == nil
+
+        starttime = Time.now.to_f
+
         begin
             Timeout.timeout(limit) do
                 if @code.is_a?(Proc)
@@ -156,6 +159,10 @@ class Facter::Util::Resolution
             return nil
         end
 
+        finishtime = Time.now.to_f
+        ms = (finishtime - starttime) * 1000
+        Facter.show_time "#{self.name}: #{"%.2f" % ms}ms"
+
         return nil if result == ""
         return result
     end

data/lib/facter/util/uptime.rb

@@ -4,7 +4,7 @@ require 'time'
 #
 module Facter::Util::Uptime
     def self.get_uptime_seconds_unix
-        uptime_proc_uptime or uptime_sysctl or uptime_who_dash_b
+        uptime_proc_uptime or uptime_sysctl or uptime_kstat or uptime_who_dash_b
     end
 
     def self.get_uptime_seconds_win
@@ -30,6 +30,12 @@ module Facter::Util::Uptime
         end
     end
 
+    def self.uptime_kstat
+        if output = Facter::Util::Resolution.exec("#{uptime_kstat_cmd} 2>/dev/null")
+            compute_uptime(Time.at(output.chomp.split(/\s/).last.to_i))
+        end
+    end
+
     def self.uptime_who_dash_b
         if output = Facter::Util::Resolution.exec("#{uptime_who_cmd} 2>/dev/null")
             compute_uptime(Time.parse(output))
@@ -48,6 +54,10 @@ module Facter::Util::Uptime
         'sysctl -b kern.boottime'
     end
 
+    def self.uptime_kstat_cmd
+        'kstat -p unix:::boot_time'
+    end
+
     def self.uptime_who_cmd
         'who -b'
     end

data/lib/facter/util/virtual.rb

@@ -22,7 +22,7 @@ module Facter::Util::Virtual
     def self.vserver?
         return false unless FileTest.exists?("/proc/self/status")
         txt = File.read("/proc/self/status")
-        return true if txt =~ /^(s_context|VxID):[[:blank:]]*[1-9]/
+        return true if txt =~ /^(s_context|VxID):[[:blank:]]*[0-9]/
         return false
     end
 
@@ -59,7 +59,18 @@ module Facter::Util::Virtual
     end
 
     def self.jail?
-        Facter::Util::Resolution.exec("/sbin/sysctl -n security.jail.jailed") == "1"
+        path = case Facter.value(:kernel)
+            when "FreeBSD" then "/sbin"
+            when "GNU/kFreeBSD" then "/bin"
+        end
+        Facter::Util::Resolution.exec("#{path}/sysctl -n security.jail.jailed") == "1"
+    end
+
+    def self.hpvm?
+        Facter::Util::Resolution.exec("/usr/bin/getconf MACHINE_MODEL").chomp =~ /Virtual Machine/
     end
 
+   def self.zlinux?
+        "zlinux"
+   end
 end

data/lib/facter/util/vlans.rb

@@ -12,7 +12,7 @@ module Facter::Util::Vlans
     def self.get_vlans
         vlans = Array.new
         if self.get_vlan_config
-            self.get_vlan_config.each do |line|
+            self.get_vlan_config.each_line do |line|
                 if line =~ /^([0-9A-Za-z]+)\.([0-9]+) /
                     vlans.insert(-1, $~[2]) if $~[2]
                 end
@@ -21,4 +21,4 @@ module Facter::Util::Vlans
 
         vlans.join(',')
     end
-end   
+end

data/lib/facter/util/xendomains.rb

@@ -0,0 +1,10 @@
+# A module to gather running Xen Domains
+#
+module Facter::Util::Xendomains
+  def self.get_domains
+    if xm_list = Facter::Util::Resolution.exec('/usr/sbin/xm list 2>/dev/null')
+      domains = xm_list.split("\n").reject { |line| line =~ /^(Name|Domain-0)/ }
+      domains.map { |line| line.split(/\s/)[0] }.join(',')
+    end
+  end
+end

data/lib/facter/virtual.rb

@@ -1,13 +1,41 @@
 require 'facter/util/virtual'
 
 Facter.add("virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
+    confine :kernel => "Darwin"
+
+    setcode do
+        require 'facter/util/macosx'
+        result = "physical"
+        output = Facter::Util::Macosx.profiler_data("SPDisplaysDataType")
+        if output.is_a?(Hash)
+            result = "parallels" if output["spdisplays_vendor-id"] =~ /0x1ab8/
+            result = "parallels" if output["spdisplays_vendor"] =~ /[Pp]arallels/
+            result = "vmware" if output["spdisplays_vendor-id"] =~ /0x15ad/
+            result = "vmware" if output["spdisplays_vendor"] =~ /VM[wW]are/
+        end
+        result
+    end
+end
+
+
+Facter.add("virtual") do
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX GNU/kFreeBSD}
 
     result = "physical"
 
     setcode do
 
-        result = "zone" if Facter::Util::Virtual.zone?
+        if Facter::Util::Virtual.zone? and Facter.value(:operatingsystem) == "Solaris"
+            result = "zone"
+        end
+
+        if Facter.value(:kernel)=="HP-UX"
+            result = "hpvm" if Facter::Util::Virtual.hpvm?
+        end
+
+        if Facter.value(:architecture)=="s390x"
+            result = "zlinux" if Facter::Util::Virtual.zlinux?
+        end
 
         if Facter::Util::Virtual.openvz?
             result = Facter::Util::Virtual.openvz_type()
@@ -38,7 +66,7 @@ Facter.add("virtual") do
             result = Facter::Util::Virtual.kvm_type()
         end
 
-        if Facter.value(:kernel)=="FreeBSD"
+        if ["FreeBSD", "GNU/kFreeBSD"].include? Facter.value(:kernel)
             result = "jail" if Facter::Util::Virtual.jail?
         end
 
@@ -49,23 +77,28 @@ Facter.add("virtual") do
                     # --- look for the vmware video card to determine if it is virtual => vmware.
                     # ---     00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter
                     result = "vmware" if p =~ /VM[wW]are/
+                    # --- look for pci vendor id used by Parallels video card
+                    # ---   01:00.0 VGA compatible controller: Unknown device 1ab8:4005
+                    result = "parallels" if p =~ /1ab8:|[Pp]arallels/
                 end
             else
                 output = Facter::Util::Resolution.exec('dmidecode')
                 if not output.nil?
                     output.each_line do |pd|
-                        result = "vmware" if pd =~ /VMware|Parallels/
+                        result = "parallels" if pd =~ /Parallels/
+                        result = "vmware" if pd =~ /VMware/
                     end
                 else
                     output = Facter::Util::Resolution.exec('prtdiag')
                     if not output.nil?
                         output.each_line do |pd|
-                            result = "vmware" if pd =~ /VMware|Parallels/
+                            result = "parallels" if pd =~ /Parallels/
+                            result = "vmware" if pd =~ /VMware/
                         end
                     end
                 end
             end
-            # VMware server 1.0.3 rpm places vmware-vmx in this place, other versions or platforms may not.
+            
             if FileTest.exists?("/usr/lib/vmware/bin/vmware-vmx")
                 result = "vmware_server"
             end
@@ -74,16 +107,15 @@ Facter.add("virtual") do
         result
     end
 end
-  
+
 Facter.add("is_virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX Darwin GNU/kFreeBSD}
 
     setcode do
-        case Facter.value(:virtual)
-        when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail"
-            true
-        else 
-            false
+        if Facter.value(:virtual) != "physical" && Facter.value(:virtual) != "xen0"
+            "true"
+        else
+            "false"
         end
     end
 end

data/lib/facter/xendomains.rb

@@ -0,0 +1,10 @@
+require 'facter/util/xendomains'
+
+Facter.add("xendomains") do
+  confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
+  confine :virtual => 'xen0'
+
+  setcode do
+    Facter::Util::Xendomains.get_domains
+  end
+end

data/spec/fixtures/ifconfig/bsd_ifconfig_all_with_multiple_interfaces

@@ -0,0 +1,18 @@
+bge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+  options=9b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM>
+  ether 00:0b:db:93:09:67
+  inet 131.252.208.203 netmask 0xffffff00 broadcast 131.252.208.255
+  inet6 fe80::20b:dbff:fe93:967%bge0 prefixlen 64 scopeid 0x1 
+  inet6 2610:10:20:208:20b:dbff:fe93:967 prefixlen 64 autoconf 
+  media: Ethernet autoselect (1000baseT <full-duplex>)
+  status: active
+bge1: flags=8802<BROADCAST,SIMPLEX,MULTICAST> metric 0 mtu 1500
+  options=9b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM>
+  ether 00:0b:db:93:09:68
+  media: Ethernet autoselect (none)
+  status: no carrier
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> metric 0 mtu 16384
+  options=3<RXCSUM,TXCSUM>
+  inet 127.0.0.1 netmask 0xff000000 
+  inet6 ::1 prefixlen 128 
+  inet6 fe80::1%lo0 prefixlen 64 scopeid 0x3

data/spec/fixtures/ifconfig/centos_5_5

@@ -0,0 +1,17 @@
+eth0      Link encap:Ethernet  HWaddr 16:8D:2A:15:17:91  
+          inet addr:100.100.100.92  Bcast:100.100.100.255  Mask:255.255.255.0
+          inet6 addr: fe80::148d:2aff:fe15:1791/64 Scope:Link
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:1914742 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:3933 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:178728699 (170.4 MiB)  TX bytes:389936 (380.7 KiB)
+
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          inet6 addr: ::1/128 Scope:Host
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:0 (0.0 b)  TX bytes:0 (0.0 b)

data/spec/fixtures/ifconfig/centos_5_5_eth0

@@ -0,0 +1,8 @@
+eth0      Link encap:Ethernet  HWaddr 16:8D:2A:15:17:91  
+          inet addr:100.100.100.92  Bcast:100.100.100.255  Mask:255.255.255.0
+          inet6 addr: fe80::148d:2aff:fe15:1791/64 Scope:Link
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:1914871 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:3960 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:178738891 (170.4 MiB)  TX bytes:393862 (384.6 KiB)

data/spec/fixtures/ifconfig/darwin_10_3_0

@@ -0,0 +1,26 @@
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+        inet6 ::1 prefixlen 128 
+        inet6 fe80::1%lo0 prefixlen 64 scopeid 0x1 
+        inet 127.0.0.1 netmask 0xff000000 
+gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280
+stf0: flags=0<> mtu 1280
+en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        ether 00:17:f2:06:e3:c2 
+        inet6 fe80::217:f2ff:fe06:e3c2%en0 prefixlen 64 scopeid 0x4 
+        inet 100.100.104.12 netmask 0xffffff00 broadcast 100.100.104.255
+        media: autoselect (1000baseT <full-duplex>)
+        status: active
+en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        ether 00:17:f2:06:e3:c3 
+        media: autoselect
+        status: inactive
+fw0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 2030
+        lladdr 00:16:cb:ff:fe:76:6e:be 
+        media: autoselect <full-duplex>
+        status: inactive
+vmnet8: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        ether 00:50:56:c0:00:08 
+        inet 172.16.95.1 netmask 0xffffff00 broadcast 172.16.95.255
+vmnet1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        ether 00:50:56:c0:00:01 
+        inet 172.16.201.1 netmask 0xffffff00 broadcast 172.16.201.255

data/spec/fixtures/ifconfig/darwin_10_3_0_en0

@@ -0,0 +1,6 @@
+en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        ether 00:17:f2:06:e3:c2 
+        inet6 fe80::217:f2ff:fe06:e3c2%en0 prefixlen 64 scopeid 0x4 
+        inet 100.100.104.12 netmask 0xffffff00 broadcast 100.100.104.255
+        media: autoselect (1000baseT <full-duplex>)
+        status: active

data/spec/fixtures/ifconfig/darwin_10_6_4

@@ -0,0 +1,28 @@
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+	inet6 ::1 prefixlen 128 
+	inet6 fe80::1%lo0 prefixlen 64 scopeid 0x1 
+	inet 127.0.0.1 netmask 0xff000000 
+gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280
+stf0: flags=0<> mtu 1280
+en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 58:b0:35:fa:08:b1 
+	media: autoselect
+	status: inactive
+en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 58:b0:35:7f:25:b3 
+	inet6 fe80::5ab0:35ff:fe7f:25b3%en1 prefixlen 64 scopeid 0x5 
+	inet 192.168.100.230 netmask 0xffffff00 broadcast 192.168.100.255
+	media: <unknown subtype>
+	status: active
+fw0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 4078
+	lladdr c4:2c:03:ff:fe:fc:c8:aa 
+	media: autoselect <full-duplex>
+	status: inactive
+vboxnet0: flags=8842<BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 0a:00:27:00:00:00 
+vmnet1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 00:50:56:c0:00:01 
+	inet 172.16.135.1 netmask 0xffffff00 broadcast 172.16.135.255
+vmnet8: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 00:50:56:c0:00:08 
+	inet 172.16.38.1 netmask 0xffffff00 broadcast 172.16.38.255

data/spec/fixtures/ifconfig/darwin_10_6_4_en1

@@ -0,0 +1,6 @@
+en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 58:b0:35:7f:25:b3 
+	inet6 fe80::5ab0:35ff:fe7f:25b3%en1 prefixlen 64 scopeid 0x5 
+	inet 192.168.100.230 netmask 0xffffff00 broadcast 192.168.100.255
+	media: <unknown subtype>
+	status: active

data/spec/fixtures/ifconfig/darwin_10_6_6_dualstack

@@ -0,0 +1,8 @@
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+	inet 127.0.0.1 netmask 0xff000000 
+	inet6 ::1 prefixlen 128 
+	inet6 fe80::1%lo0 prefixlen 64 scopeid 0x1 
+en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 00:25:4b:ca:56:72 
+	media: autoselect
+	status: inactive

data/spec/fixtures/ifconfig/darwin_10_6_6_dualstack_en1

@@ -0,0 +1,7 @@
+en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 00:25:00:48:19:ef 
+	inet6 fe80::225:ff:fe48:19ef%en1 prefixlen 64 scopeid 0x5 
+	inet 192.168.1.207 netmask 0xffffff00 broadcast 192.168.1.255
+	inet6 2000:44b4:32:400::1 prefixlen 64 
+	media: autoselect
+	status: active

data/spec/fixtures/ifconfig/darwin_9_8_0

@@ -0,0 +1,26 @@
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+        inet6 fe80::1%lo0 prefixlen 64 scopeid 0x1 
+        inet 127.0.0.1 netmask 0xff000000 
+        inet6 ::1 prefixlen 128 
+gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280
+stf0: flags=0<> mtu 1280
+en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        inet6 fe80::217:f2ff:fe06:e42e%en0 prefixlen 64 scopeid 0x4 
+        inet 100.100.107.4 netmask 0xffffff00 broadcast 100.100.107.255
+        ether 00:17:f2:06:e4:2e 
+        media: autoselect (1000baseT <full-duplex>) status: active
+        supported media: autoselect 10baseT/UTP <half-duplex> 10baseT/UTP <full-duplex> 10baseT/UTP <full-duplex,hw-loopback> 10baseT/UTP <full-duplex,flow-control> 100baseTX <half-duplex> 100baseTX <full-duplex> 100baseTX <full-duplex,hw-loopback> 100baseTX <full-duplex,flow-control> 1000baseT <full-duplex> 1000baseT <full-duplex,hw-loopback> 1000baseT <full-duplex,flow-control>
+en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        ether 00:17:f2:06:e4:2f 
+        media: autoselect status: inactive
+        supported media: autoselect 10baseT/UTP <half-duplex> 10baseT/UTP <full-duplex> 10baseT/UTP <full-duplex,hw-loopback> 10baseT/UTP <full-duplex,flow-control> 100baseTX <half-duplex> 100baseTX <full-duplex> 100baseTX <full-duplex,hw-loopback> 100baseTX <full-duplex,flow-control> 1000baseT <full-duplex> 1000baseT <full-duplex,hw-loopback> 1000baseT <full-duplex,flow-control>
+fw0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 2030
+        lladdr 00:16:cb:ff:fe:76:66:f2 
+        media: autoselect <full-duplex> status: inactive
+        supported media: autoselect <full-duplex>
+vmnet8: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        inet 192.168.210.1 netmask 0xffffff00 broadcast 192.168.210.255
+        ether 00:50:56:c0:00:08 
+vmnet1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        inet 192.168.61.1 netmask 0xffffff00 broadcast 192.168.61.255
+        ether 00:50:56:c0:00:01