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

2011-01-31 Miguel de Dios <miguel.dedios@artica.es> 

* include/javascript/pandora_modules.js, pandoradb.sql,
	extras/pandoradb_migrate_v3.2_to_v4.0.sql,
	godmode/modules/manage_network_components_form.php,
	godmode/modules/manage_network_components_form_network.php,
	godmode/modules/manage_network_components.php: added the "post process"
	parameter to network component and use in network component editor and
	module editor.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3788 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-01-31 09:23:05 +00:00
parent e4df0635e4
commit e6e1f0c071
7 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2011-01-31 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora_modules.js, pandoradb.sql,
extras/pandoradb_migrate_v3.2_to_v4.0.sql,
godmode/modules/manage_network_components_form.php,
godmode/modules/manage_network_components_form_network.php,
godmode/modules/manage_network_components.php: added the "post process"
parameter to network component and use in network component editor and
module editor.
2011-01-27 Sancho Lerena <slerena@artica.es>
* ssh_console/howto_sign_applet.README,

5
pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
View File

@ -22,3 +22,8 @@
-- Table `tgrupo`
-- -----------------------------------------------------
ALTER TABLE `tgrupo` MODIFY `nombre` text;
-- -----------------------------------------------------
-- Table `tnetwork_component`
-- -----------------------------------------------------
ALTER TABLE `tnetwork_component` ADD COLUMN `post_process` double(18,13) default 0;

7
pandora_console/godmode/modules/manage_network_components.php
View File

@ -55,6 +55,7 @@ $min_critical = (int) get_parameter ('min_critical');
$max_critical = (int) get_parameter ('max_critical');
$ff_event = (int) get_parameter ('ff_event');
$history_data = (bool) get_parameter ('history_data');
$post_process = (float) get_parameter('post_process');
$id = (int) get_parameter ('id');
$snmp_version = (string) get_parameter('snmp_version');
@ -128,7 +129,8 @@ if ($create_component) {
'min_ff_event' => $ff_event,
'custom_string_1' => $custom_string_1,
'custom_string_2' => $custom_string_2,
'custom_string_3' => $custom_string_3));
'custom_string_3' => $custom_string_3,
'post_process' => $post_process));
if ($id === false) {
print_error_message (__('Could not be created'));
include_once ('godmode/modules/manage_network_components_form.php');
@ -183,7 +185,8 @@ if ($update_component) {
'min_ff_event' => $ff_event,
'custom_string_1' => $custom_string_1,
'custom_string_2' => $custom_string_2,
'custom_string_3' => $custom_string_3));
'custom_string_3' => $custom_string_3,
'post_process' => $post_process));
if ($result === false) {
print_error_message (__('Could not be updated'));
include_once ('godmode/modules/manage_network_components_form.php');

2
pandora_console/godmode/modules/manage_network_components_form.php
View File

@ -54,6 +54,7 @@ if (isset ($id)) {
$min_critical = $component["min_critical"];
$ff_event = $component["min_ff_event"];
$history_data = $component["history_data"];
$post_process = $component["post_process"];
if ($type >= 15 && $type <= 18) {
@ -90,6 +91,7 @@ if (isset ($id)) {
$min_critical = 0;
$ff_event = 0;
$history_data = true;
$post_process = 0;
$snmp_version = 1;
$snmp3_auth_user = '';

6
pandora_console/godmode/modules/manage_network_components_form_network.php
View File

@ -78,6 +78,12 @@ $data[3] = print_select(array('noAuthNoPriv' => __('Not auth and not privacy met
'authNoPriv' => __('Auth and not privacy method'), 'authPriv' => __('Auth and privacy method')), 'snmp3_security_level', $snmp3_security_level, '', '', '', true);
push_table_row($data, 'field_snmpv3_row3');
$data = array();
$data[0] = __('Post process').' '.print_help_icon ('postprocess', true);
$data[1] = print_input_text ('post_process', $post_process, '', 12, 25, true);
$data[2] = $data[3] = '';
push_table_row($data, 'field_process');
/* Advanced stuff */

1
pandora_console/include/javascript/pandora_modules.js
View File

@ -153,6 +153,7 @@ function configure_modules_form () {
$("#text-min_critical").attr ("value", (data["min_critical"] == 0) ? 0 : data["min_critical"]);
$("#text-max_critical").attr ("value", (data["max_critical"] == 0) ? 0 : data["max_critical"]);
$("#text-ff_threshold").attr ("value", (data["min_ff_event"] == 0) ? 0 : data["min_ff_event"]);
$("#text-post_process").attr("value", (data["post_process"] == 0) ? 0 : data["post_process"])
$("#component_loading").hide ();
$("#id_module_type").change ();

1
pandora_console/pandoradb.sql
View File

@ -526,6 +526,7 @@ CREATE TABLE IF NOT EXISTS `tnetwork_component` (
`custom_string_3` text default '',
`custom_integer_1` int(10) default 0,
`custom_integer_2` int(10) default 0,
`post_process` double(18,13) default 0,
PRIMARY KEY (`id_nc`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;