set FQDN and DNS_DOMAIN key

closes: #1358 Reported-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>
fusioninventory · Jul 1, 2012 · 29de824 · 29de824
1 parent c2a009d
commit 29de824
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@ Revision history for FusionInventory agent
 2.3.0
 General:
 * various UTF8 encoding fixes
+* Add DNS_DOMAIN and FQDN in OPERATINGSYSTEM section
 
 BSD:
 * Megaraid and 3ware RAID controller support (Egor Morozov)

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Generic.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Generic.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use English qw(-no_match_vars);
+use Net::Domain qw(hostfqdn hostdomain);
 
 sub isEnabled {
     return 1;
@@ -15,7 +16,9 @@ sub doInventory {
     my $inventory = $params{inventory};
 
     $inventory->setOperatingSystem({
-        KERNEL_NAME => $OSNAME
+            KERNEL_NAME => $OSNAME,
+            FQDN => hostfqdn(),
+            DNS_DOMAIN => hostdomain()
     });
 }
 

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Inventory.pm b/lib/FusionInventory/Agent/Task/Inventory/Inventory.pm
@@ -63,7 +63,7 @@ my %fields = (
                              DEFAULTGATEWAY VMSYSTEM WINOWNER WINPRODID
                              WINPRODKEY WINCOMPANY WINLANG CHASSIS_TYPE/ ],
     OPERATINGSYSTEM  => [ qw/KERNEL_NAME KERNEL_VERSION NAME VERSION FULL_NAME 
-                            SERVICE_PACK INSTALL_DATE/ ],
+                            SERVICE_PACK INSTALL_DATE FQDN DNS_DOMAIN/ ],
     ACCESSLOG        => [ qw/USERID LOGDATE/ ],
     VIRTUALMACHINES  => [ qw/MEMORY NAME UUID STATUS SUBSYSTEM VMTYPE VCPU
                              VMID MAC COMMENT OWNER/ ],