From 29de82485ef48392ab38bafc3bef0b307d8523ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Sun, 1 Jul 2012 14:43:15 +0200 Subject: [PATCH] set FQDN and DNS_DOMAIN key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes: #1358 Reported-by: Sébastien Prud'homme --- Changes | 1 + lib/FusionInventory/Agent/Task/Inventory/Input/Generic.pm | 5 ++++- lib/FusionInventory/Agent/Task/Inventory/Inventory.pm | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index ec509de590..7f10eee8b8 100644 --- 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 index 507aa7a60f..50ea543b6e 100644 --- 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 index 17479c93a8..e9a92bb4c2 100644 --- 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/ ],