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

2008-07-09 Evi Vanoost <vanooste@rcbi.rochester.edu> 

* pandora_console/pandoradb.sql: Updated indexes

        * pandora_agents/mac_osx: Updated pieces here and there including the installer and startup scripts to make them more compatible and reliable

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@948 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
guruevi 2008-07-09 16:41:13 +00:00
parent 1ea2b6d718
commit b1a5ff119d
6 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_agents/ChangeLog
View File

@ -1,4 +1,8 @@
2008-07-08 Evi Vanoost <vanooste@rcbi.rochester.edu> 2008-07-09 Evi Vanoost <vanooste@rcbi.rochester.edu>
* pandora_agents/mac_osx: Updated pieces here and there including the installer and startup scripts to make them more compatible and reliable
2008-07-08 Evi Vanoost <vanooste@rcbi.rochester.edu>
* pandora_agents/tools * pandora_agents/tools
pandora_agents/linux/plugins pandora_agents/linux/plugins

17
pandora_agents/mac_osx/pandora_agent.conf
View File

@ -57,7 +57,7 @@ transfer_mode local
# cron_mode # cron_mode
# If set to 1 allows the agent to be configured via the web console. # If set to 1 allows the agent to be configured via the web console.
remote_config 1 remote_config 0
# Module Definition # Module Definition
@ -221,17 +221,16 @@ module_end
module_begin module_begin
module_name DNS module_name DNS
module_type generic_proc module_type generic_proc
module_exec ps aux | grep "sbin\/named" | wc -l module_exec ps -A | grep "sbin\/named" | wc -l
module_description DNS Server module_description DNS Server
module_end module_end
# Firewall always has 1 rule (allow) so we substract one.
# You should have alerts in case the number of rules change # You should have alerts in case the number of rules change
module_begin module_begin
module_name Firewall Status module_name Firewall Status
module_type generic_data module_type generic_data
module_exec echo `sudo ipfw show | wc -l` - 1 | bc module_exec ipfw show | wc -l
module_description Firewall (number of rules) module_description Firewall (number of rules)
module_end module_end
@ -252,14 +251,14 @@ module_end
#module_begin #module_begin
#module_name Mail (SMTP) #module_name Mail (SMTP)
#module_type generic_proc #module_type generic_proc
#module_exec ps -A | grep "master" | grep -v "grep" | wc -l #module_exec ps -A | grep "smtpd -n smtp" | wc -l
#module_description Mail - SMTP Server (postfix) #module_description Mail - SMTP Server (postfix)
#module_end #module_end
#module_begin #module_begin
#module_name Mail (IMAP) #module_name Mail (IMAP)
#module_type generic_proc #module_type generic_proc
#module_exec ps -A | grep "cyrus" | grep -v "grep" | wc -l #module_exec ps -Au | grep "master" | grep "cyrus" | wc -l
#module_description Mail - IMAP Server (cyrus) #module_description Mail - IMAP Server (cyrus)
#module_end #module_end
@ -302,14 +301,14 @@ module_end
#module_begin #module_begin
#module_name NFS #module_name NFS
#module_type generic_proc #module_type generic_proc
#module_exec ps aux | grep "nfsd-master" | grep -v "grep" | wc -l #module_exec ps -A | grep "nfsd-master" | grep -v "grep" | wc -l
#module_description NFS File Server #module_description NFS File Server
#module_end #module_end
module_begin module_begin
module_name Open Directory module_name Open Directory
module_type generic_proc module_type generic_proc
module_exec ps aux | grep "bin\/krb5kdc" | wc -l module_exec ps -A | grep "bin\/krb5kdc" | wc -l
module_description Open Directory module_description Open Directory
module_end module_end
@ -330,7 +329,7 @@ module_end
module_begin module_begin
module_name Software Update module_name Software Update
module_type generic_proc module_type generic_proc
module_exec if [ `ps -A | grep "etc\/swupd" | wc -l` -gt "1" ]; then echo 1; else echo 0; fi module_exec ps -A | grep "etc\/swupd" | wc -l
module_description Software Update module_description Software Update
module_end module_end

7
pandora_agents/mac_osx/pandora_agent_installer
View File

@ -96,18 +96,15 @@ install () {
echo "Linking Pandora FMS Agent configuration to $PANDORA_CFG/pandora_agent.conf..." echo "Linking Pandora FMS Agent configuration to $PANDORA_CFG/pandora_agent.conf..."
ln -s $PANDORA_HOME/pandora_agent.conf $PANDORA_CFG ln -s $PANDORA_HOME/pandora_agent.conf $PANDORA_CFG
echo "Linking Pandora FMS Agent user configuration to $PANDORA_CFG/pandora_user.conf..."
ln -s $PANDORA_HOME/pandora_user.conf $PANDORA_CFG
echo "Setting secure permissions and ownership for all Pandora FMS Agent files..." echo "Setting secure permissions and ownership for all Pandora FMS Agent files..."
chown -R root $PANDORA_HOME chown -R root $PANDORA_HOME
chmod -R 600 $PANDORA_TEMP/data_out chmod -R 600 $PANDORA_TEMP/data_out
chmod 640 $PANDORA_LOG chmod 640 $PANDORA_LOG
chgrp 3 $PANDORA_LOG chgrp 3 $PANDORA_LOG
echo "Copyng start-up daemon script at $PANDORA_STARTUP"; echo "Copying start-up daemon script at $PANDORA_STARTUP";
cp -R pandora_fms $PANDORA_STARTUP cp -R pandora_fms $PANDORA_STARTUP
chown -R root:wheel $PANDORA_STARTUP chown -R root:wheel $PANDORA_STARTUP
chmod -R 644 $PANDORA_STARTUP chmod -R 744 $PANDORA_STARTUP
chown -R root $PANDORA_BIN chown -R root $PANDORA_BIN
echo "Done." echo "Done."
echo " " echo " "

4
pandora_agents/mac_osx/pandora_fms/pandora_fms
View File

@ -24,7 +24,7 @@ StartService()
if [ -f $PIDFILE ] if [ -f $PIDFILE ]
then then
PID_BA=`cat $PIDFILE` PID_BA=`cat $PIDFILE`
if [ ! -z "`ps -Af | awk '{ print $2 }' | grep $PID_BA`" ] if [ ! -z "`ps -A | awk '{ print $1 }' | grep $PID_BA`" ]
then then
echo "Pandora FMS Agent is currently running on this machine with PID $PID_BA" echo "Pandora FMS Agent is currently running on this machine with PID $PID_BA"
echo "Cannot launch again. Aborting." echo "Cannot launch again. Aborting."
@ -43,7 +43,7 @@ StopService()
then then
echo "Stopping Pandora Agent." echo "Stopping Pandora Agent."
PID_2=`cat $PIDFILE` PID_2=`cat $PIDFILE`
if [ ! -z "`ps -f -p $PID_2 | grep -v grep | grep 'pandora_agent'`" ] if [ ! -z "`ps -A | grep -v grep | grep 'pandora_agent'`" ]
then then
kill -9 $PID_2 kill -9 $PID_2
fi fi

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2008-07-09 Evi Vanoost <vanooste@rcbi.rochester.edu>
* pandoradb.sql: Updated indexes
2008-07-09 Sancho LErena <slerena@gmail.com> 2008-07-09 Sancho LErena <slerena@gmail.com>
* include/functions_html.php, include/functions_db.php, * include/functions_html.php, include/functions_db.php,

53
pandora_console/pandoradb.sql
View File

@ -25,10 +25,10 @@ CREATE TABLE `taddress` (
`id_a` bigint(20) unsigned NOT NULL auto_increment, `id_a` bigint(20) unsigned NOT NULL auto_increment,
`ip` varchar(15) NOT NULL default '', `ip` varchar(15) NOT NULL default '',
`ip_pack` int(10) unsigned NOT NULL default '0', `ip_pack` int(10) unsigned NOT NULL default '0',
PRIMARY KEY (`id_a`) PRIMARY KEY (`id_a`),
KEY `ip` (`ip`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `taddress_agent` ( CREATE TABLE `taddress_agent` (
`id_ag` bigint(20) unsigned NOT NULL auto_increment, `id_ag` bigint(20) unsigned NOT NULL auto_increment,
`id_a` bigint(20) unsigned NOT NULL default '0', `id_a` bigint(20) unsigned NOT NULL default '0',
@ -49,7 +49,7 @@ CREATE TABLE `tagent_access` (
CREATE TABLE `tagente` ( CREATE TABLE `tagente` (
`id_agente` mediumint(8) unsigned NOT NULL auto_increment, `id_agente` mediumint(8) unsigned NOT NULL auto_increment,
`nombre` varchar(100) NOT NULL default '', `nombre` varchar(100) NOT NULL default '',
`direccion` varchar(100) default '', `direccion` varchar(100) default NULL,
`comentarios` varchar(255) default '', `comentarios` varchar(255) default '',
`id_grupo` int(10) unsigned NOT NULL default '0', `id_grupo` int(10) unsigned NOT NULL default '0',
`ultimo_contacto` datetime NOT NULL default '0000-00-00 00:00:00', `ultimo_contacto` datetime NOT NULL default '0000-00-00 00:00:00',
@ -66,10 +66,11 @@ CREATE TABLE `tagente` (
`id_wmi_server` int(4) unsigned default '0', `id_wmi_server` int(4) unsigned default '0',
`id_parent` mediumint(8) unsigned default '0', `id_parent` mediumint(8) unsigned default '0',
PRIMARY KEY (`id_agente`), PRIMARY KEY (`id_agente`),
KEY `nombre` (`nombre`), KEY `nombre` (`nombre`),
KEY `direccion` (`direccion`), KEY `direccion` (`direccion`),
KEY `disabled` (`disabled`) KEY `disabled` (`disabled`),
) ENGINE=InnoDB DEFAULT CHARSET=utf8; KEY `id_grupo` (`id_grupo`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `tagente_datos` ( CREATE TABLE `tagente_datos` (
`id_agente_datos` bigint(10) unsigned NOT NULL auto_increment, `id_agente_datos` bigint(10) unsigned NOT NULL auto_increment,
@ -117,7 +118,6 @@ CREATE TABLE `tagente_datos_string` (
KEY `data_string_index_1` (`id_agente`,`id_agente_modulo`) KEY `data_string_index_1` (`id_agente`,`id_agente_modulo`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `tagente_estado` ( CREATE TABLE `tagente_estado` (
`id_agente_estado` int(10) unsigned NOT NULL auto_increment, `id_agente_estado` int(10) unsigned NOT NULL auto_increment,
`id_agente_modulo` int(20) NOT NULL default '0', `id_agente_modulo` int(20) NOT NULL default '0',
@ -129,14 +129,15 @@ CREATE TABLE `tagente_estado` (
`last_try` datetime default NULL, `last_try` datetime default NULL,
`utimestamp` bigint(20) NOT NULL default '0', `utimestamp` bigint(20) NOT NULL default '0',
`current_interval` int(10) unsigned NOT NULL default '0', `current_interval` int(10) unsigned NOT NULL default '0',
`running_by` int(10) unsigned NULL default 0, `running_by` int(10) unsigned default '0',
`last_execution_try` bigint(20) NOT NULL default '0', `last_execution_try` bigint(20) NOT NULL default '0',
PRIMARY KEY (`id_agente_estado`), PRIMARY KEY (`id_agente_estado`),
KEY `status_index_1` (`id_agente_modulo`), KEY `status_index_1` (`id_agente_modulo`),
KEY `status_index_2` (`id_agente_modulo`,`estado`), KEY `status_index_2` (`id_agente_modulo`,`estado`),
KEY `current_interval` (`current_interval`), KEY `current_interval` (`current_interval`),
KEY `last_execution_try` (`last_execution_try`) KEY `running_by` (`running_by`),
) ENGINE=InnoDB DEFAULT CHARSET=utf8; KEY `last_execution_try` (`last_execution_try`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/* /*
@ -167,21 +168,22 @@ CREATE TABLE `tagente_modulo` (
`ip_target` varchar(100) default '', `ip_target` varchar(100) default '',
`id_module_group` int(4) unsigned default '0', `id_module_group` int(4) unsigned default '0',
`flag` tinyint(3) unsigned default '1', `flag` tinyint(3) unsigned default '1',
`id_modulo` int(11) unsigned NULL default 0, `id_modulo` int(11) unsigned default '0',
`disabled` tinyint(3) unsigned default '0', `disabled` tinyint(3) unsigned default '0',
`id_export` tinyint(3) unsigned default '0', `id_export` tinyint(3) unsigned default '0',
`plugin_user` varchar(250) default '', `plugin_user` varchar(250) default '',
`plugin_pass` varchar(250) default '', `plugin_pass` varchar(250) default '',
`plugin_parameter` text default '', `plugin_parameter` text,
`id_plugin` int(11) default '0', `id_plugin` int(11) default '0',
`post_process` double(18,2) default NULL, `post_process` double(18,2) default NULL,
`prediction_module` bigint(14) default '0', `prediction_module` bigint(14) default '0',
`max_timeout` tinyint(3) unsigned default '0', `max_timeout` tinyint(3) unsigned default '0',
PRIMARY KEY (`id_agente_modulo`, `id_agente`), PRIMARY KEY (`id_agente_modulo`,`id_agente`),
KEY `tam_agente` (`id_agente`), KEY `tam_agente` (`id_agente`),
KEY `id_tipo_modulo` (`id_tipo_modulo`), KEY `id_tipo_modulo` (`id_tipo_modulo`),
KEY `tam_plugin` (`id_plugin`) KEY `tam_plugin` (`id_plugin`),
) ENGINE=InnoDB DEFAULT CHARSET=utf8; KEY `disabled` (`disabled`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- snmp_oid is also used for WMI query -- snmp_oid is also used for WMI query
@ -463,7 +465,6 @@ CREATE TABLE `tperfil` (
PRIMARY KEY (`id_perfil`) PRIMARY KEY (`id_perfil`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `trecon_task` ( CREATE TABLE `trecon_task` (
`id_rt` int(10) unsigned NOT NULL auto_increment, `id_rt` int(10) unsigned NOT NULL auto_increment,
`name` varchar(100) NOT NULL default '', `name` varchar(100) NOT NULL default '',
@ -478,11 +479,11 @@ CREATE TABLE `trecon_task` (
`status` tinyint(4) NOT NULL default '0', `status` tinyint(4) NOT NULL default '0',
`interval_sweep` int(10) unsigned NOT NULL default '0', `interval_sweep` int(10) unsigned NOT NULL default '0',
`id_network_server_assigned` int(10) unsigned NOT NULL default '0', `id_network_server_assigned` int(10) unsigned NOT NULL default '0',
`extended_info` varchar(250) default NULL, `extended_info` varchar(250) default NULL,
`extended_value` varchar(250) default NULL, `extended_value` varchar(250) default NULL,
PRIMARY KEY (`id_rt`) PRIMARY KEY (`id_rt`),
) ENGINE=InnoDB DEFAULT CHARSET=utf8; KEY `recon_task_daemon` (`id_network_server`,`utimestamp`,`status`,`interval_sweep`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `tserver` ( CREATE TABLE `tserver` (
`id_server` int(10) unsigned NOT NULL auto_increment, `id_server` int(10) unsigned NOT NULL auto_increment,