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

2014-08-14 Hirofumi Kosaka <kosaka@rworks.jp> 

* lib/PandoraFMS/PluginServer.pm: Added new alert macros
	_plugin_param1_ (,_plugin_param2_ and so on) to access to
	each of plugin parameters. Also added _plugin_param1_desc_
	to access to each description of plugin parameters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2014-08-14 03:45:57 +00:00
parent 4ccdb0f2b0
commit 8d94e15eb5
2 changed files with 22 additions and 2 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 @@
2014-08-14 Hirofumi Kosaka <kosaka@rworks.jp>
* lib/PandoraFMS/PluginServer.pm: Added new alert macros
_plugin_param1_ (,_plugin_param2_ and so on) to access to
each of plugin parameters. Also added _plugin_param1_desc_
to access to each description of plugin parameters.
2014-08-14 Koichiro Kikuchi <koichiro@rworks.jp> 2014-08-14 Koichiro Kikuchi <koichiro@rworks.jp>
* FreeBSD/tentacle_server: Set rcvar statically. * FreeBSD/tentacle_server: Set rcvar statically.

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

@ -169,6 +169,7 @@ sub data_consumer ($$) {
} }
my $parameters = $plugin->{'parameters'}; my $parameters = $plugin->{'parameters'};
my %plugin_macros_for_alert_processing;
if (!defined($module->{'macros'})){ if (!defined($module->{'macros'})){
$module->{'macros'} = ""; $module->{'macros'} = "";
@ -183,9 +184,22 @@ sub data_consumer ($$) {
if(ref($macros) eq "HASH") { if(ref($macros) eq "HASH") {
foreach my $macro_id (keys(%macros)) foreach my $macro_id (keys(%macros))
{ {
my $macro_field = safe_output($macros{$macro_id}{'macro'});
my $macro_desc = safe_output($macros{$macro_id}{'desc'});
my $macro_value = safe_output($macros{$macro_id}{'value'}); my $macro_value = safe_output($macros{$macro_id}{'value'});
# build parameters to invoke plugin
$parameters =~ s/$macros{$macro_id}{'macro'}/$macro_value/g; $parameters =~ s/$macros{$macro_id}{'macro'}/$macro_value/g;
# build 'plugin module' dependent alert macros
my $field_number = $macro_field;
$field_number = s/.*([0-9]+).*/$1/;
my $name_for_desc = "_plugin_param${field_number}_desc_";
my $name_for_value = "_plugin_param${field_number}_";
$plugin_macros_for_alert_processing{$name_for_desc} = $macro_desc;
$plugin_macros_for_alert_processing{$name_for_value} = $macro_value;
} }
} }
} }
@ -281,8 +295,7 @@ sub data_consumer ($$) {
my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime($utimestamp)); my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime($utimestamp));
my %data = ("data" => $module_data); my %data = ("data" => $module_data);
pandora_process_module ($pa_config, \%data, '', $module, '', $timestamp, $utimestamp, $self->getServerID (), $dbh); pandora_process_module ($pa_config, \%data, '', $module, '', $timestamp, $utimestamp, $self->getServerID (), $dbh, \%plugin_macros_for_alert_processing);
my $agent_os_version = get_db_value ($dbh, 'SELECT os_version FROM tagente WHERE id_agente = ?', $module->{'id_agente'}); my $agent_os_version = get_db_value ($dbh, 'SELECT os_version FROM tagente WHERE id_agente = ?', $module->{'id_agente'});
if ($agent_os_version eq ''){ if ($agent_os_version eq ''){