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-16 17:53:58 +02:00
parent 8e24a2c8f7 bf779c52b3
commit e785d06f94
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/FreeBSD/pandora_server.conf.new
View File

@ -74,9 +74,9 @@ dbhost 127.0.0.1
# verbosity: level of detail on errors/messages (0 default, 1 verbose, 2 debug.... 10 noisy)
# -v in command line (verbose) or -d (debug). Set this to 10 when try to locate problems and
# set to 0 or 1 on production enviroments.
# set to 1 or 3 on production enviroments.
verbosity 1
verbosity 3
# Master Server, 1 if master server (normal mode), 0 for slave mode (slave in multi-server setup)
@ -263,7 +263,7 @@ autocreate 1
# max_log_size: Specify max size of Pandora FMS server log file (1MB by default). If
# log file grows above this limit, is renamed to "pandora_server.log.old".
max_log_size 65536
max_log_size 1048576
# max_queue_files (500 by default)
# When server have more than max_queue_files in incoming directory, skips the read

6
pandora_server/conf/pandora_server.conf.new
View File

@ -74,9 +74,9 @@ dbhost 127.0.0.1
# verbosity: level of detail on errors/messages (0 default, 1 verbose, 2 debug.... 10 noisy)
# -v in command line (verbose) or -d (debug). Set this to 10 when try to locate problems and
# set to 0 or 1 on production enviroments.
# set to 1 or 3 on production enviroments.
verbosity 1
verbosity 3
# Master Server, 1 if master server (normal mode), 0 for slave mode (slave in multi-server setup)
@ -276,7 +276,7 @@ autocreate 1
# max_log_size: Specify max size of Pandora FMS server log file (1MB by default). If
# log file grows above this limit, is renamed to "pandora_server.log.old".
max_log_size 65536
max_log_size 1048576
# max_queue_files (500 by default)
# When server have more than max_queue_files in incoming directory, skips the read

6
pandora_server/conf/pandora_server.conf.windows
View File

@ -66,9 +66,9 @@ dbhost 192.168.55.1
# verbosity: level of detail on errors/messages (0 default, 1 verbose, 2 debug.... 10 noisy)
# -v in command line (verbose) or -d (debug). Set this to 10 when try to locate problems and
# set to 0 or 1 on production enviroments.
# set to 1 or 3 on production enviroments.
verbosity 5
verbosity 3
# Master Server, 1 if master server (normal mode), 0 for slave mode (slave in multi-server setup)
@ -224,7 +224,7 @@ autocreate 1
# max_log_size: Specify max size of Pandora FMS server log file (1MB by default). If
# log file grows above this limit, is renamed to "pandora_server.log.old".
max_log_size 65536
max_log_size 1048576
# max_queue_files (250 by default)
# When server have more than max_queue_files in incoming directory, skips the read

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -284,7 +284,7 @@ sub pandora_load_config {
$pa_config->{'autocreate'} = 1;
# max log size (bytes)
$pa_config->{'max_log_size'} = 32000;
$pa_config->{'max_log_size'} = 1048576;
# Ignore the timestamp in the XML and use the file timestamp instead
$pa_config->{'use_xml_timestamp'} = 0;

2
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -301,10 +301,12 @@ sub process_xml_data ($$$$$) {
if (defined ($data->{'group'}) && $data->{'group'} ne '') {
$group_id = get_group_id ($dbh, $data->{'group'});
if (! defined (get_group_name ($dbh, $group_id))) {
pandora_event ($pa_config, "Unable to create agent '$agent_name': group '" . $data->{'group'} . "' does not exist.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
logger($pa_config, "Group " . $data->{'group'} . " does not exist.", 3);
return;
}
} else {
pandora_event ($pa_config, "Unable to create agent '$agent_name': autocreate_group $group_id does not exist. Edit the pandora_server.conf file and change it.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
logger($pa_config, "Group id $group_id does not exist (check autocreate_group config token).", 3);
return;
}

2
pandora_server/lib/PandoraFMS/PluginServer.pm
View File

@ -286,7 +286,7 @@ sub data_consumer ($$) {
}
if (! defined $module_data || $module_data eq '') {
logger ($pa_config,"[ERROR] Undefined value returned by Plugin query. Is the server out of memory?" , 0);
logger ($pa_config,"[ERROR] Undefined value returned by plug-in module " . $agent->{'nombre'} . " agent " . $agent->{'nombre'} . ". Is the server out of memory?" , 3);
pandora_update_module_on_error ($pa_config, $module, $dbh);
return;
}