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

Merge branch 'develop' of github.com:pandorafms/pandorafms into develop

This commit is contained in:
mdtrooper 2014-09-15 11:45:23 +02:00
parent 6b577bed8d 245d7c7bba
commit 3a42df6376
8 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/unix/FreeBSD/pandora_agent.conf
View File

@ -31,7 +31,7 @@ debug 0
#description Demo agent #description Demo agent
# Group assigned for this agent (descriptive, p.e: Servers) # Group assigned for this agent (descriptive, p.e: Servers)
#group Servers group Servers
# Autotime: Enforce to server to ignore timestamp coming from this # Autotime: Enforce to server to ignore timestamp coming from this
# agent, used when agents has no timer or it's inestable. 1 to enable # agent, used when agents has no timer or it's inestable. 1 to enable
@ -209,5 +209,4 @@ module_end
module_plugin grep_log /var/log/auth.log Syslog sshd module_plugin grep_log /var/log/auth.log Syslog sshd
# Plugin for inventory on the agent (Only Enterprise) # Plugin for inventory on the agent (Only Enterprise)
# module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route
# module_plugin inventory 1 cpu ram video nic hd cdrom software

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

@ -44,7 +44,7 @@ udp_server_auth_address 0.0.0.0
#description This is a demo agent for Linux #description This is a demo agent for Linux
# Group assigned for this agent (descriptive, p.e: Servers) # Group assigned for this agent (descriptive, p.e: Servers)
#group Servers group Servers
# address: Enforce to server a ip address to this agent # address: Enforce to server a ip address to this agent
# You can also try to detect the first IP using "auto", for example # You can also try to detect the first IP using "auto", for example
@ -175,6 +175,17 @@ module_max_critical 100
module_unit % module_unit %
module_end module_end
# vmstat syntax depends on linux distro and vmstat command version, please check before use it
module_begin
module_name CPU IOWait
module_type generic_data
module_interval 1
module_exec vmstat 1 2 | tail -1 | awk '{ print $16 }'
module_min_warning 10
module_min_critical 16
module_unit %
module_end
#Get load average #Get load average
module_begin module_begin
module_name Load Average module_name Load Average
@ -203,7 +214,7 @@ module_end
module_begin module_begin
module_name Number processes module_name Number processes
module_type generic_data module_type generic_data
module_exec ps -A | tail --lines=+5 | wc -l module_exec ps aux | wc -l
module_description Total processes module_description Total processes
module_min_warning 150 module_min_warning 150
module_max_warning 249 module_max_warning 249
@ -240,11 +251,9 @@ module_plugin pandora_netusage
module_plugin grep_log /var/log/syslog Syslog_error ERROR module_plugin grep_log /var/log/syslog Syslog_error ERROR
# Plugin for inventory on the agent (Only Enterprise) # Plugin for inventory on the agent (Only Enterprise)
# module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route
module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route
# Log collection modules. Only for enterprise version, this will collect log files for forensic analysis. # Log collection modules. Only for enterprise version, this will collect log files for forensic analysis.
# This is for LOG monitoring, only on enterprise version # This is for LOG monitoring, only on enterprise version
#module_plugin grep_log_module /var/log/messages Syslog \.\* #module_plugin grep_log_module /var/log/messages Syslog \.\*

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

@ -31,7 +31,7 @@ debug 0
#description Demo agent #description Demo agent
# Group assigned for this agent (descriptive, p.e: Servers) # Group assigned for this agent (descriptive, p.e: Servers)
#group Servers group Servers
# Autotime: Enforce to server to ignore timestamp coming from this # Autotime: Enforce to server to ignore timestamp coming from this
# agent, used when agents has no timer or it's inestable. 1 to enable # agent, used when agents has no timer or it's inestable. 1 to enable

5
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -401,12 +401,13 @@ $table_advanced->colspan[5][1] = 2;
$table_advanced->data[5][3] = __('FF timeout') . ' ' . ui_print_help_icon ('ff_timeout', true); $table_advanced->data[5][3] = __('FF timeout') . ' ' . ui_print_help_icon ('ff_timeout', true);
$module_type_name = modules_get_type_name($id_module_type); $module_type_name = modules_get_type_name($id_module_type);
$table_advanced->data[5][4] = '';
if (preg_match ('/async/', $module_type_name) || $edit) { if (preg_match ('/async/', $module_type_name) || $edit) {
$table_advanced->data[5][4] = '<span id="ff_timeout">' . html_print_input_text ('ff_timeout', $ff_timeout, $table_advanced->data[5][4] .= '<span id="ff_timeout">' . html_print_input_text ('ff_timeout', $ff_timeout,
'', 5, 10, true, $disabledBecauseInPolicy).ui_print_help_tip (__('Timeout in secs from start of flip flop counting. If this value is exceeded, FF counter is reset. Set to 0 for no timeout.'), true) . '</span>'; '', 5, 10, true, $disabledBecauseInPolicy).ui_print_help_tip (__('Timeout in secs from start of flip flop counting. If this value is exceeded, FF counter is reset. Set to 0 for no timeout.'), true) . '</span>';
} }
if (!preg_match ('/async/', $module_type_name) || $edit) { if (!preg_match ('/async/', $module_type_name) || $edit) {
$table_advanced->data[5][4] = '<span id="ff_timeout_disable">' . __('Disabled') . ui_print_help_tip (__('This value can be set only in the async modules.'), true) . '</span>'; $table_advanced->data[5][4] .= '<span id="ff_timeout_disable">' . __('Disabled') . ui_print_help_tip (__('This value can be set only in the async modules.'), true) . '</span>';
} }
/* Tags */ /* Tags */

4
pandora_console/include/functions_treeview.php
View File

@ -1059,8 +1059,8 @@ function treeview_getData ($type) {
AND ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo" . AND ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo" .
$search_sql . $search_sql .
$user_tags_sql . " $user_tags_sql . "
ORDER BY ttag.name ' . $order_collate . ' ASC"; ORDER BY ttag.name $order_collate ASC";
$list = db_get_all_rows_sql($sql); $list = db_get_all_rows_sql($sql);
break; break;
} }

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -89,7 +89,7 @@ then
cp -aRf conf/* temp_package/usr/share/pandora_server/conf/ cp -aRf conf/* temp_package/usr/share/pandora_server/conf/
cp -aRf util temp_package/usr/share/pandora_server/ cp -aRf util temp_package/usr/share/pandora_server/
cp -aRf lib/* temp_package/usr/lib/perl5/ cp -aRf lib/* temp_package/usr/lib/perl5/
cp -aRf AUTHORS COPYING ChangeLog README temp_package/usr/share/pandora_server/ cp -aRf AUTHORS COPYING README temp_package/usr/share/pandora_server/
cp -aRf util/pandora_server temp_package/etc/init.d/ cp -aRf util/pandora_server temp_package/etc/init.d/
cp -aRf util/tentacle_serverd temp_package/etc/init.d/ cp -aRf util/tentacle_serverd temp_package/etc/init.d/

2
pandora_server/pandora_server.redhat.spec
View File

@ -148,7 +148,7 @@ exit 0
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README %doc AUTHORS COPYING README
%{_sysconfdir}/rc.d/init.d/pandora_server %{_sysconfdir}/rc.d/init.d/pandora_server
%{_sysconfdir}/rc.d/init.d/tentacle_serverd %{_sysconfdir}/rc.d/init.d/tentacle_serverd
%{_sysconfdir}/cron.hourly/pandora_db %{_sysconfdir}/cron.hourly/pandora_db

2
pandora_server/pandora_server.spec
View File

@ -73,7 +73,7 @@ cp -aRf conf/* $RPM_BUILD_ROOT%{prefix}/pandora_server/conf/
cp -aRf conf/pandora_server.conf.new $RPM_BUILD_ROOT/etc/pandora/ cp -aRf conf/pandora_server.conf.new $RPM_BUILD_ROOT/etc/pandora/
cp -aRf util $RPM_BUILD_ROOT%{prefix}/pandora_server/ cp -aRf util $RPM_BUILD_ROOT%{prefix}/pandora_server/
cp -aRf lib/* $RPM_BUILD_ROOT/usr/lib/perl5/ cp -aRf lib/* $RPM_BUILD_ROOT/usr/lib/perl5/
cp -aRf AUTHORS COPYING ChangeLog README $RPM_BUILD_ROOT%{prefix}/pandora_server/ cp -aRf AUTHORS COPYING README $RPM_BUILD_ROOT%{prefix}/pandora_server/
cp -aRf util/pandora_server $RPM_BUILD_ROOT/etc/init.d/ cp -aRf util/pandora_server $RPM_BUILD_ROOT/etc/init.d/
cp -aRf util/tentacle_serverd $RPM_BUILD_ROOT/etc/init.d/ cp -aRf util/tentacle_serverd $RPM_BUILD_ROOT/etc/init.d/