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

2013-04-02 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Added a suffix to the auto-monitoring XML
	  so that it does not conflict with a local agent.

	* util/pandora_manage.pl: Fixed a couple of bugs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7912 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-04-02 14:54:13 +00:00
parent 3509fd1b3d
commit d07928a3c6
3 changed files with 11 additions and 4 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 @@
2013-04-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added a suffix to the auto-monitoring XML
so that it does not conflict with a local agent.
* util/pandora_manage.pl: Fixed a couple of bugs.
2013-04-02 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Added group ACL to 'Special days list'.

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

@ -3735,7 +3735,7 @@ sub pandora_self_monitoring ($$) {
$xml_output .= "</agent_data>";
my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".".$utimestamp.".data";
my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".".$utimestamp.".self.data";
open (XMLFILE, ">> $filename") or die "[FATAL] Could not open internal monitoring XML file for deploying monitorization at '$filename'";
print XMLFILE $xml_output;

6
pandora_server/util/pandora_manage.pl
View File

@ -1095,7 +1095,7 @@ sub cli_create_network_module($) {
my $policy_id;
if($in_policy == 0) {
my $agent_id = get_agent_id($dbh,$agent_name);
$agent_id = get_agent_id($dbh,$agent_name);
exist_check($agent_id,'agent',$agent_name);
my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);
@ -1222,7 +1222,7 @@ sub cli_create_snmp_module($) {
my $policy_id;
if($in_policy == 0) {
my $agent_id = get_agent_id($dbh,$agent_name);
$agent_id = get_agent_id($dbh,$agent_name);
exist_check($agent_id,'agent',$agent_name);
my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);
@ -1353,7 +1353,7 @@ sub cli_create_plugin_module($) {
my $policy_id;
if($in_policy == 0) {
my $agent_id = get_agent_id($dbh,$agent_name);
$agent_id = get_agent_id($dbh,$agent_name);
exist_check($agent_id,'agent',$agent_name);
my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);