tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-27 Dario Rodriguez <dario.rodriguez@artica.es> 

* unix/plugins/inventory,
	unix/Linux/pandora_agent.conf: Inventory improved: added Mac to NIC, 
	created new modules for IPs and Route table. Update pandora agent conf.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6203 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-04-27 10:12:29 +00:00
parent 8d2c8167c5
commit 538bcf4b40
3 changed files with 88 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_agents/ChangeLog
View File

@ -1,3 +1,11 @@
2012-04-27 Dario Rodriguez <dario.rodriguez@artica.es>
* unix/plugins/inventory,
unix/Linux/pandora_agent.conf: Inventory improved: added Mac to NIC,
created new modules for IPs and Route table. Update pandora agent conf.
MERGED FROM 4.0.2
2012-04-26 Dario Rodriguez <dario.rodriguez@artica.es>
* unix/plugins/inventory: Fixed inventory plugin

2
pandora_agents/unix/Linux/pandora_agent.conf
View File

@ -268,7 +268,7 @@ module_plugin grep_log /var/log/syslog Syslog ssh
# Plugin for inventory on the agent (Only Enterprise)
# module_plugin inventory 1 cpu ram video nic hd cdrom software
# module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users process ip route
# Example of preconditions
#module_begin

83
pandora_agents/unix/plugins/inventory
View File

@ -195,6 +195,71 @@ sub get_software_module_data ($$) {
}
}
#Get the list of interfaces with the ip assigned
sub get_ips ($$) {
my ($name, $modules) = @_;
my $ifconfig = `ifconfig`;
my @ifconfig_array = split("\n", $ifconfig);
for(my $i = 0; $i<$#ifconfig_array; $i++) {
#Check for an interface
if ($ifconfig_array[$i] =~ /Link/) {
my %info;
my @line_split = split(" ", $ifconfig_array[$i]);
#Get interface name
$info{'interface'} = $line_split[0];
#Get IP address
my $line = $ifconfig_array[$i+1];
$line =~ s/\s+//g;
@line_split = split(":", $line);
if($line_split[1] =~ /(\d+\.\d+\.\d+\.\d+).+/) {
$info{'ip'} = $1;
}
$info{'_keys'} = ['interface', 'ip'];
push (@{$modules->{$name}}, \%info);
}
}
}
#Get route table
sub get_route_table ($$) {
my ($name, $modules) = @_;
my $route_table = `route`;
my @table_split = split("\n", $route_table);
for (my $i=2; $i<=$#table_split; $i++) {
my @split = split(" ", $table_split[$i]);
my %info;
$info{'destination'} = $split[0];
$info{'gateway'} = $split[1];
$info{'mask'} = $split[2];
$info{'flags'} = $split[3];
$info{'metric'} = $split[4];
$info{'ref'} = $split[5];
$info{'use'} = $split[6];
$info{'interface'} = $split[7];
$info{'_keys'} = ['destination', 'gateway', 'mask', 'flags', 'metric', 'use', 'interface'];
push (@{$modules->{$name}}, \%info);
}
}
# Print module data
sub print_module ($$) {
my ($name, $module) = @_;
@ -220,7 +285,7 @@ sub print_module ($$) {
# Check command line parameters
if ($#ARGV < 0) {
print "Usage: $0 <interval> [cpu] [ram] [video] [nic] [hd] [cdrom] [software] [init_services] [filesystem] [users] [process] \n\n";
print "Usage: $0 <interval> [cpu] [ram] [video] [nic] [hd] [cdrom] [software] [init_services] [filesystem] [users] [process] [ip] [route]\n\n";
exit 1;
}
@ -298,13 +363,13 @@ while (my $line = shift (@hwinfo)) {
# NIC
if (($line =~ /\*\-network/ || $line =~ /Hardware Class: network/) && ($enable_all == 1 || $enabled{'nic'} == 1)) {
if ($Mode eq 'LSHW') {
get_module_data ('NIC', \@hwinfo, ['product', 'description', 'vendor'], \%modules);
get_module_data ('NIC', \@hwinfo, ['product', 'description', 'vendor', 'serial'], \%modules);
} else {
# Spaces before Device and Vendor are intentional to avoid matching SubDevice and SubVendor
get_module_data ('NIC', \@hwinfo, ['Model', ' Device', ' Vendor'], \%modules);
get_module_data ('NIC', \@hwinfo, ['Model', ' Device', ' Vendor', 'HW Address'], \%modules);
}
}
# CDROM
if (($line =~ /\*\-cdrom/ || $line =~ /Hardware Class: cdrom/) && ($enable_all == 1 || $enabled{'cdrom'} == 1)) {
if ($Mode eq 'LSHW') {
@ -350,6 +415,16 @@ if ($enable_all == 1 || $enabled{'users'} == 1){
get_users ('Users', \%modules);
}
#ip
if ($enable_all == 1 || $enabled{'ip'} == 1) {
get_ips('IP', \%modules);
}
#route
if ($enable_all == 1 || $enabled{'route'} == 1) {
get_route_table('Route', \%modules);
}
# Print module data
print "<inventory>\n";
while (my ($name, $module) = each (%modules)) {