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

2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* util/pandora_manage.pl: Added some checks that I forget in my 
	last commit.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5194 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-29 10:31:14 +00:00
parent dd05ea5ee9
commit 754e0dae66
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* util/pandora_manage.pl: Added some checks that I forget in my
last commit.
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* util/pandora_manage.pl: Added checks of agent and module names at * util/pandora_manage.pl: Added checks of agent and module names at

15
pandora_server/util/pandora_manage.pl
View File

@ -643,6 +643,10 @@ sub cli_create_network_module() {
print "[INFO] Adding module '$module_name' to agent '$agent_name'\n\n"; print "[INFO] Adding module '$module_name' to agent '$agent_name'\n\n";
my $agent_id = get_agent_id($dbh,$agent_name);
my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);
non_exist_check($module_exists, 'module name', $module_name);
if ($module_type =~ m/.?snmp.?/) { if ($module_type =~ m/.?snmp.?/) {
print "[ERROR] '$module_type' is not a valid type. For snmp modules use --create_snmp_module parameter\n\n"; print "[ERROR] '$module_type' is not a valid type. For snmp modules use --create_snmp_module parameter\n\n";
$param = '--create_snmp_module'; $param = '--create_snmp_module';
@ -658,7 +662,6 @@ sub cli_create_network_module() {
my $module_type_id = get_module_id($dbh,$module_type); my $module_type_id = get_module_id($dbh,$module_type);
exist_check($module_type_id,'module type',$module_type); exist_check($module_type_id,'module type',$module_type);
my $agent_id = get_agent_id($dbh,$agent_name);
exist_check($agent_id,'agent',$agent_name); exist_check($agent_id,'agent',$agent_name);
my $module_group_id = get_module_group_id($dbh,$module_group); my $module_group_id = get_module_group_id($dbh,$module_group);
@ -717,11 +720,14 @@ sub cli_create_snmp_module() {
print "[INFO] Adding snmp module '$module_name' to agent '$agent_name'\n\n"; print "[INFO] Adding snmp module '$module_name' to agent '$agent_name'\n\n";
my $agent_id = get_agent_id($dbh,$agent_name);
my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);
non_exist_check($module_exists, 'module name', $module_name);
# The get_module_id has wrong name. Change in future # The get_module_id has wrong name. Change in future
my $module_type_id = get_module_id($dbh,$module_type); my $module_type_id = get_module_id($dbh,$module_type);
exist_check($module_type_id,'module type',$module_type); exist_check($module_type_id,'module type',$module_type);
my $agent_id = get_agent_id($dbh,$agent_name);
exist_check($agent_id,'agent',$agent_name); exist_check($agent_id,'agent',$agent_name);
my $module_group_id = get_module_group_id($dbh,$module_group); my $module_group_id = get_module_group_id($dbh,$module_group);
@ -793,6 +799,10 @@ sub cli_create_plugin_module() {
print "[INFO] Adding module '$module_name' to agent '$agent_name'\n\n"; print "[INFO] Adding module '$module_name' to agent '$agent_name'\n\n";
my $agent_id = get_agent_id($dbh,$agent_name);
my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);
non_exist_check($module_exists, 'module name', $module_name);
# The get_module_id has wrong name. Change in future # The get_module_id has wrong name. Change in future
my $module_type_id = get_module_id($dbh,$module_type); my $module_type_id = get_module_id($dbh,$module_type);
exist_check($module_type_id,'module type',$module_type); exist_check($module_type_id,'module type',$module_type);
@ -802,7 +812,6 @@ sub cli_create_plugin_module() {
exit; exit;
} }
my $agent_id = get_agent_id($dbh,$agent_name);
exist_check($agent_id,'agent',$agent_name); exist_check($agent_id,'agent',$agent_name);
my $module_group_id = get_module_group_id($dbh,$module_group); my $module_group_id = get_module_group_id($dbh,$module_group);