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

2013-07-17 Ramon Novoa <rnovoa@artica.es> 

* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	  godmode/snmpconsole/snmp_alert.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql: Added support for SNMP alert ordering.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8540 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-07-17 17:39:27 +00:00
parent c4ad9890b6
commit 0c36881c3e
8 changed files with 59 additions and 31 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 @@
2013-07-17 Ramon Novoa <rnovoa@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
godmode/snmpconsole/snmp_alert.php,
pandoradb.sql,
pandoradb.postgreSQL.sql,
pandoradb.oracle.sql: Added support for SNMP alert ordering.
2013-07-17 Sergio Martin <sergio.martin@artica.es> 2013-07-17 Sergio Martin <sergio.martin@artica.es>
* include/functions_users.php * include/functions_users.php

1
pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
View File

@ -166,6 +166,7 @@ ALTER TABLE `talert_snmp` ADD COLUMN `_snmp_f7_` text NOT NULL;
ALTER TABLE `talert_snmp` ADD COLUMN `_snmp_f8_` text NOT NULL; ALTER TABLE `talert_snmp` ADD COLUMN `_snmp_f8_` text NOT NULL;
ALTER TABLE `talert_snmp` ADD COLUMN `_snmp_f9_` text NOT NULL; ALTER TABLE `talert_snmp` ADD COLUMN `_snmp_f9_` text NOT NULL;
ALTER TABLE `talert_snmp` ADD COLUMN `_snmp_f10_` text NOT NULL; ALTER TABLE `talert_snmp` ADD COLUMN `_snmp_f10_` text NOT NULL;
ALTER TABLE `talert_snmp` ADD COLUMN `position` int(10) UNSIGNED NOT NULL DEFAULT '0';
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
-- Table `tagente_modulo` -- Table `tagente_modulo`

1
pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
View File

@ -198,6 +198,7 @@ ALTER TABLE talert_snmp ADD (al_field8 CLOB default '');
ALTER TABLE talert_snmp ADD (al_field9 CLOB default ''); ALTER TABLE talert_snmp ADD (al_field9 CLOB default '');
ALTER TABLE talert_snmp ADD (al_field10 CLOB default ''); ALTER TABLE talert_snmp ADD (al_field10 CLOB default '');
ALTER TABLE talert_snmp ADD (al_field10 CLOB default ''); ALTER TABLE talert_snmp ADD (al_field10 CLOB default '');
ALTER TABLE talert_snmp ADD (position NUMBER(10, 0) default 0 NOT NULL);
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
-- Table tevent_filter -- Table tevent_filter

1
pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
View File

@ -189,6 +189,7 @@ ALTER TABLE "talert_snmp" ADD COLUMN "al_field7" text NOT NULL default '';
ALTER TABLE "talert_snmp" ADD COLUMN "al_field8" text NOT NULL default ''; ALTER TABLE "talert_snmp" ADD COLUMN "al_field8" text NOT NULL default '';
ALTER TABLE "talert_snmp" ADD COLUMN "al_field9" text NOT NULL default ''; ALTER TABLE "talert_snmp" ADD COLUMN "al_field9" text NOT NULL default '';
ALTER TABLE "talert_snmp" ADD COLUMN "al_field10" text NOT NULL default ''; ALTER TABLE "talert_snmp" ADD COLUMN "al_field10" text NOT NULL default '';
ALTER TABLE "talert_snmp" ADD COLUMN "position" INTEGER NOT NULL default 0;
-- ----------------------------------------------------- -- -----------------------------------------------------
-- Table "tagente_modulo" -- Table "tagente_modulo"

70
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -70,6 +70,7 @@ else if (isset ($_GET["submit"])) {
$custom_oid_data_10 = (string) get_parameter ("custom_oid_data_10"); $custom_oid_data_10 = (string) get_parameter ("custom_oid_data_10");
$trap_type = (int) get_parameter ("trap_type", -1); $trap_type = (int) get_parameter ("trap_type", -1);
$single_value = (string) get_parameter ("single_value"); $single_value = (string) get_parameter ("single_value");
$position = (int) get_parameter ("position");
if ($time_threshold == -1) { if ($time_threshold == -1) {
$time_threshold = $time_other; $time_threshold = $time_other;
@ -107,7 +108,8 @@ else if (isset ($_GET["submit"])) {
'_snmp_f9_' => $custom_oid_data_9, '_snmp_f9_' => $custom_oid_data_9,
'_snmp_f10_' => $custom_oid_data_10, '_snmp_f10_' => $custom_oid_data_10,
'trap_type' => $trap_type, 'trap_type' => $trap_type,
'single_value' => $single_value); 'single_value' => $single_value,
'position' => $position);
$result = db_process_sql_insert('talert_snmp', $values); $result = db_process_sql_insert('talert_snmp', $values);
@ -133,7 +135,8 @@ else if (isset ($_GET["submit"])) {
_snmp_f1_ = '%s', _snmp_f2_ = '%s', _snmp_f3_ = '%s', _snmp_f1_ = '%s', _snmp_f2_ = '%s', _snmp_f3_ = '%s',
_snmp_f4_ = '%s', _snmp_f5_ = '%s', _snmp_f6_ = '%s', _snmp_f4_ = '%s', _snmp_f5_ = '%s', _snmp_f6_ = '%s',
_snmp_f7_ = '%s', _snmp_f8_ = '%s', _snmp_f9_ = '%s', _snmp_f7_ = '%s', _snmp_f8_ = '%s', _snmp_f9_ = '%s',
_snmp_f10_ = '%s', trap_type = %d, single_value = '%s' _snmp_f10_ = '%s', trap_type = %d, single_value = '%s',
position = '%s'
WHERE id_as = %d", WHERE id_as = %d",
$priority, $alert_type, $al_field1, $al_field2, $al_field3, $priority, $alert_type, $al_field1, $al_field2, $al_field3,
$al_field4, $al_field5, $al_field6, $al_field7, $al_field8, $al_field4, $al_field5, $al_field6, $al_field7, $al_field8,
@ -142,7 +145,7 @@ else if (isset ($_GET["submit"])) {
$max_alerts, $min_alerts, $custom_oid_data_1, $custom_oid_data_2, $max_alerts, $min_alerts, $custom_oid_data_1, $custom_oid_data_2,
$custom_oid_data_3, $custom_oid_data_4, $custom_oid_data_5, $custom_oid_data_3, $custom_oid_data_4, $custom_oid_data_5,
$custom_oid_data_6, $custom_oid_data_7, $custom_oid_data_8, $custom_oid_data_6, $custom_oid_data_7, $custom_oid_data_8,
$custom_oid_data_9, $custom_oid_data_10, $trap_type, $single_value, $id_as); $custom_oid_data_9, $custom_oid_data_10, $trap_type, $single_value, $position, $id_as);
$result = db_process_sql ($sql); $result = db_process_sql ($sql);
@ -197,6 +200,7 @@ if ((isset ($_GET["update_alert"])) && ($_GET["update_alert"] != -1)) {
$custom_oid_data_10 = $alert["_snmp_f10_"]; $custom_oid_data_10 = $alert["_snmp_f10_"];
$trap_type = $alert["trap_type"]; $trap_type = $alert["trap_type"];
$single_value = $alert["single_value"]; $single_value = $alert["single_value"];
$position = $alert["position"];
} }
elseif (isset ($_GET["update_alert"])) { elseif (isset ($_GET["update_alert"])) {
// Variable init // Variable init
@ -232,6 +236,7 @@ elseif (isset ($_GET["update_alert"])) {
$custom_oid_data_10 = ''; $custom_oid_data_10 = '';
$trap_type = -1; $trap_type = -1;
$single_value = ''; $single_value = '';
$position = 0;
} }
// Header // Header
@ -459,7 +464,9 @@ if (isset ($_GET["update_alert"])) {
break; break;
} }
echo '</td></tr>'; echo '</td></tr>';
echo '<tr><td class="datos">'.__('Position').'</td><td class="datos">';
html_print_input_text ("position", $position, '', 3);
echo '</td></tr>';
echo '</table>'; echo '</table>';
echo "<table style='width:98%'>"; echo "<table style='width:98%'>";
@ -493,52 +500,57 @@ else {
$table->class= "databox"; $table->class= "databox";
$table->align = array (); $table->align = array ();
$table->head[0] = __('Alert action'); $table->head[0] = '<span title="' . __('Position') . '">' . __('P.') . '</span>';
$table->align[0] = 'center';
$table->head[1] = __('Alert action');
$table->head[1] = __('SNMP Agent'); $table->head[2] = __('SNMP Agent');
$table->size[1] = "90px"; $table->size[2] = "90px";
$table->align[1] = 'center';
$table->head[2] = __('OID');
$table->align[2] = 'center'; $table->align[2] = 'center';
$table->head[3] = __('Custom Value/OID'); $table->head[3] = __('OID');
$table->align[3] = 'center'; $table->align[3] = 'center';
$table->head[4] = __('Description'); $table->head[4] = __('Custom Value/OID');
$table->align[4] = 'center';
$table->head[5] = __('Times fired'); $table->head[5] = __('Description');
$table->align[5] = 'center';
$table->head[6] = __('Last fired'); $table->head[6] = __('Times fired');
$table->align[6] = 'center'; $table->align[6] = 'center';
$table->head[7] = __('Action'); $table->head[7] = __('Last fired');
$table->size[7] = "50px";
$table->align[7] = 'center'; $table->align[7] = 'center';
$table->head[8] = __('Action');
$table->size[8] = "50px";
$table->align[8] = 'center';
foreach ($result as $row) { foreach ($result as $row) {
$data = array (); $data = array ();
$data[0] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' . alerts_get_alert_action_name ($row["id_alert"]) . '</a>'; $data[0] = $row["position"];
$data[1] = __('SNMP Agent'); $data[1] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' . alerts_get_alert_action_name ($row["id_alert"]) . '</a>';
$data[1] = $row["agent"];
$data[2] = __('OID');
$data[2] = $row["oid"];
$data[3] = __('Custom Value/OID');
$data[3] = $row["custom_oid"];
$data[4] = $row["description"]; $data[2] = __('SNMP Agent');
$data[5] = $row["times_fired"]; $data[2] = $row["agent"];
$data[3] = __('OID');
$data[3] = $row["oid"];
$data[4] = __('Custom Value/OID');
$data[4] = $row["custom_oid"];
$data[5] = $row["description"];
$data[6] = $row["times_fired"];
if (($row["last_fired"] != "1970-01-01 00:00:00") and ($row["last_fired"] != "01-01-1970 00:00:00")) { if (($row["last_fired"] != "1970-01-01 00:00:00") and ($row["last_fired"] != "01-01-1970 00:00:00")) {
$data[6] = ui_print_timestamp($row["last_fired"], true); $data[7] = ui_print_timestamp($row["last_fired"], true);
} }
else { else {
$data[6] = __('Never'); $data[7] = __('Never');
} }
$data[7] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' . $data[8] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' .
html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>' . html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>' .
'&nbsp;&nbsp;<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">' . '&nbsp;&nbsp;<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">' .
html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>'; html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>';

3
pandora_console/pandoradb.oracle.sql
View File

@ -302,7 +302,8 @@ CREATE TABLE talert_snmp (
_snmp_f9_ CLOB default '', _snmp_f9_ CLOB default '',
_snmp_f10_ CLOB default '', _snmp_f10_ CLOB default '',
trap_type NUMBER(10, 0) DEFAULT -1 NOT NULL, trap_type NUMBER(10, 0) DEFAULT -1 NOT NULL,
single_value VARCHAR2(255) DEFAULT '' single_value VARCHAR2(255) DEFAULT '',
"position" NUMBER(10, 0) default 0 NOT NULL
); );
CREATE SEQUENCE talert_snmp_s INCREMENT BY 1 START WITH 1; CREATE SEQUENCE talert_snmp_s INCREMENT BY 1 START WITH 1;

3
pandora_console/pandoradb.postgreSQL.sql
View File

@ -286,7 +286,8 @@ CREATE TABLE "talert_snmp" (
"_snmp_f9_" text DEFAULT '', "_snmp_f9_" text DEFAULT '',
"_snmp_f10_" text DEFAULT '', "_snmp_f10_" text DEFAULT '',
"trap_type" INTEGER NOT NULL DEFAULT '-1', "trap_type" INTEGER NOT NULL DEFAULT '-1',
"single_value" varchar(255) DEFAULT '' "single_value" varchar(255) DEFAULT '',
"position" INTEGER NOT NULL default 0
); );
CREATE TABLE "talert_commands" ( CREATE TABLE "talert_commands" (

1
pandora_console/pandoradb.sql
View File

@ -293,6 +293,7 @@ CREATE TABLE IF NOT EXISTS `talert_snmp` (
`_snmp_f10_` text, `_snmp_f10_` text,
`trap_type` int(11) NOT NULL default '-1', `trap_type` int(11) NOT NULL default '-1',
`single_value` varchar(255) default '', `single_value` varchar(255) default '',
`position` int(10) unsigned NOT NULL default '0',
PRIMARY KEY (`id_as`) PRIMARY KEY (`id_as`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;