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

2012-04-25 Sergio Martin <sergio.martin@artica.es> 

* unix/plugins/inventory: Fixed init_services inventory modules
	in machines /etc/rc.d/rcX.d paths instead of /etc/rcX.d/ paths
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-04-25 15:55:26 +00:00
parent a3236c252e
commit d48ae7a199
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_agents/ChangeLog
View File

@ -1,3 +1,9 @@
2012-04-25 Sergio Martin <sergio.martin@artica.es>
* unix/plugins/inventory: Fixed init_services inventory modules
in machines /etc/rc.d/rcX.d paths instead of /etc/rcX.d/ paths
Merged from 4.0.x
2012-04-25 Sergio Martin <sergio.martin@artica.es> 2012-04-25 Sergio Martin <sergio.martin@artica.es>
* unix/plugins/inventory: Fixed several bugs in the * unix/plugins/inventory: Fixed several bugs in the

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

@ -1,4 +1,4 @@
# Base config file for Pandora FMS agents
# Version 3.0, GNU/Linux # Version 3.0, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
@ -31,7 +31,7 @@ udp_server_port 41122
udp_server_auth_address 0.0.0.0 udp_server_auth_address 0.0.0.0
# By default, agent takes machine name # By default, agent takes machine name
#agent_name adama agent_name huelga
#Parent agent_name #Parent agent_name
#parent_agent_name caprica #parent_agent_name caprica

9
pandora_agents/unix/plugins/inventory
View File

@ -88,7 +88,14 @@ sub get_servicies_init_machine($$) {
$runlevel =~ s/\s*$//; #rtrim $runlevel =~ s/\s*$//; #rtrim
#end trim($runlevel) #end trim($runlevel)
my $script = "ls /etc/rc" . $runlevel .".d/ -l | grep \"^l.*\" | grep \" S.* \" | cut -d' ' -f11"; my $script = "";
if (-e "/etc/rc" . $runlevel .".d/") {
$script = "ls /etc/rc" . $runlevel .".d/ -l | grep \"^l.*\" | grep \" S.* \" | cut -d' ' -f11";
}
else {
$script = "ls /etc/rc.d/rc" . $runlevel .".d/ -l | grep \"^l.*\" | grep \" S.* \" | cut -d' ' -f11";
}
my @services = `$script`; my @services = `$script`;
foreach my $row (@services) { foreach my $row (@services) {

2
pandora_agents/win32/bin/pandora_agent.conf
View File

@ -17,7 +17,7 @@
# NOTE: The variables $*$ will be substituted in the installation wizard # NOTE: The variables $*$ will be substituted in the installation wizard
server_ip $ServerIP$ server_ip 172.18.183.4
server_path /var/spool/pandora/data_in server_path /var/spool/pandora/data_in
temporal "$AgentTemp$" temporal "$AgentTemp$"