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

2010-06-10 Sancho Lerena <slerena@artica.es> 

* lib/PandoraFMS/Core.pm: Redefine downtime name and description if
	not defined.

	* lib/PandoraFMS/Tools.pm: Octopus is now known as Octopods.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2900 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2010-06-10 09:25:26 +00:00
parent a0d108bada
commit f00b5163d5
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2010-06-10 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Core.pm: Redefine downtime name and description if
not defined.
* lib/PandoraFMS/Tools.pm: Octopus is now known as Octopods.
2010-06-09 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf: Set the default server_threshold to 5

8
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -789,6 +789,14 @@ sub pandora_planned_downtime ($$) {
foreach my $downtime (@downtimes) {
if (!defined($downtime->{'description'})){
$downtime->{'description'} = "N/A";
}
if (!defined($downtime->{'name'})){
$downtime->{'name'} = "N/A";
}
logger($pa_config, "Starting planned downtime '" . $downtime->{'name'} . "'.", 10);
db_do($dbh, 'UPDATE tplanned_downtime SET executed = 1 WHERE id = ?', $downtime->{'id'});

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

@ -104,7 +104,7 @@ sub pandora_get_os ($) {
elsif ($command =~ m/3com/i){
return 11;
}
elsif ($command =~ m/Octopus/i){
elsif ($command =~ m/Octopods/i){
return 13;
}
elsif ($command =~ m/BSD/i){