From 030388530edcfb1f53b798fec292bf6e3a770d13 Mon Sep 17 00:00:00 2001 From: Steven Hajducko Date: Thu, 19 Jun 2008 17:58:36 -0700 Subject: Fixes #1376 - Display memory facts for AIX memfree is still unavailable - no known way to get the fact without root and monitoring commands. --- CHANGELOG | 2 ++ lib/facter/memory.rb | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b097ad8..b67b214 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ ?: + Fixes #1376 - Display memory facts for AIX + Fixes #1334 - Forced Facter to use LANG=C Fixes #1357 - Change ps syntax for OSX and BSD diff --git a/lib/facter/memory.rb b/lib/facter/memory.rb index 46fe859..01858d8 100644 --- a/lib/facter/memory.rb +++ b/lib/facter/memory.rb @@ -18,3 +18,28 @@ require 'facter/util/memory' end end end + +if Facter.value(:kernel) == "AIX" + swap = Facter::Util::Resolution.exec('swap -l') + swapfree, swaptotal = 0, 0 + swap.each do |dev| + if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/ + swaptotal += $1.to_i + swapfree += $2.to_i + end + end + + Facter.add("SwapSize") do + confine :kernel => :aix + setcode do + Facter::Memory.scale_number(swaptotal.to_f,"MB") + end + end + + Facter.add("SwapFree") do + confine :kernel => :aix + setcode do + Facter::Memory.scale_number(swapfree.to_f,"MB") + end + end +end -- cgit