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

2012-09-13 Sergio Martin <sergio.martin@artica.es> 

* include/styles/pandora_legacy.css
	include/styles/pandora.css
	include/functions.php
	pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	operation/events/events_list.php
	images/skin/skin_default/include/styles/pandora.css
	images/status_sets/default/severity_major_pixel.png
	images/status_sets/default/severity_minor_pixel.png
	images/status_sets/default/severity_major.png
	images/status_sets/default/severity_minor.png
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added images and styles
	for minor and major criticities



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6969 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-09-13 14:06:08 +00:00
parent c1b99f5e45
commit f8c2c3bf29
16 changed files with 85 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandora_console/ChangeLog
View File

@ -1,3 +1,22 @@
2012-09-13 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora_legacy.css
include/styles/pandora.css
include/functions.php
pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
operation/events/events_list.php
images/skin/skin_default/include/styles/pandora.css
images/status_sets/default/severity_major_pixel.png
images/status_sets/default/severity_minor_pixel.png
images/status_sets/default/severity_major.png
images/status_sets/default/severity_minor.png
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added images and styles
for minor and major criticities
2012-09-13 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_list.php: Display instructions for

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

@ -121,6 +121,7 @@ CREATE TABLE IF NOT EXISTS `tplanned_downtime_modules` (
-- -----------------------------------------------------
ALTER TABLE `tevento` ADD COLUMN (`source` tinytext NOT NULL,
`id_extra` tinytext NOT NULL);
ALTER TABLE `tevento` MODIFY COLUMN `event_type` ENUM('going_unknown','unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal','configuration_change') CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT 'unknown';
-- -----------------------------------------------------
-- Table `tgrupo`

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

@ -316,6 +316,7 @@ ALTER TABLE tlayout_data ADD (enable_link NUMBER(5, 0) NOT NULL default 1);
ALTER TABLE tevento ADD (critical_instructions VARCHAR2(255) default '');
ALTER TABLE tevento ADD (warning_instructions VARCHAR2(255) default '');
ALTER TABLE tevento ADD (unknown_instructions VARCHAR2(255) default '');
ALTER TABLE tevento MODIFY CONSTRAINT tevento_event_type_cons CHECK (event_type IN ('going_unknown','unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change'))
-- -----------------------------------------------------
-- Table `tagente_modulo`

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

@ -318,6 +318,7 @@ ALTER TABLE "tlayout_data" ADD COLUMN "enable_link" SMALLINT NOT NULL default 1;
ALTER TABLE "tevento" ADD COLUMN "critical_instructions" text default '';
ALTER TABLE "tevento" ADD COLUMN "warning_instructions" text default '';
ALTER TABLE "tevento" ADD COLUMN "unknown_instructions" text default '';
ALTER TYPE type_tevento_event ADD VALUE 'going_unknown' BEFORE 'unknown';
-- -----------------------------------------------------
-- Table `tagente_modulo`

29
pandora_console/images/skin/skin_default/include/styles/pandora.css
View File

@ -1727,7 +1727,36 @@ div.warn {
height: 0px;
}
/* classes for event priorities. Sits now in functions.php */
.datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a {
background-color: #52A000;
color: #fff;
}
.datos_red, .datos_redf9, .datos_red a, .datos_redf9 a{
background-color: #FF3E41;
color: #fff !important;
}
.datos_yellow, .datos_yellowf9 {
background-color: #F5E535;
color: #000;
}
a.datos_blue, .datos_bluef9, .datos_blue {
background-color: #77E2F2;
color: #000;
}
.datos_grey, .datos_greyf9 {
background-color: #E4E4E4;
}
.datos_sky, .datos_skyf9 {
background-color: #05FFF0;
}
.datos_pink, .datos_pinkf9 {
background-color: #FF92E9;
}
td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9 {
padding: 5px 5px 5px 5px;
}
.menu li, .menu li.selected, .menu li.not_selected {
display: block;

BIN
pandora_console/images/status_sets/default/severity_major.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 348 B

BIN
pandora_console/images/status_sets/default/severity_major_pixel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 B

BIN
pandora_console/images/status_sets/default/severity_minor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 331 B

BIN
pandora_console/images/status_sets/default/severity_minor_pixel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 B

13
pandora_console/include/functions.php
View File

@ -835,6 +835,7 @@ function get_event_types () {
$types['critical'] = __('Monitor Critical');
$types['warning'] = __('Monitor Warning');
$types['normal'] = __('Monitor Normal');
$types['going_unknown'] = __('Monitor Unknown');
$types['alert_fired'] = __('Alert fired');
$types['alert_recovered'] = __('Alert recovered');
@ -900,6 +901,12 @@ function get_priority_name ($priority) {
case 4:
return __('Critical');
break;
case 5:
return __('Minor');
break;
case 6:
return __('Major');
break;
default:
return __('All');
break;
@ -930,6 +937,12 @@ function get_priority_class($priority) {
case 4:
return "datos_red";
break;
case 5:
return "datos_sky";
break;
case 6:
return "datos_pink";
break;
default:
return "datos_grey";
break;

6
pandora_console/include/styles/pandora.css
View File

@ -1624,6 +1624,12 @@ a.datos_blue, .datos_bluef9, .datos_blue {
.datos_grey, .datos_greyf9 {
background-color: #E4E4E4;
}
.datos_sky, .datos_skyf9 {
background-color: #05FFF0;
}
.datos_pink, .datos_pinkf9 {
background-color: #FF92E9;
}
td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9 {
padding: 5px 5px 5px 5px;
}

6
pandora_console/include/styles/pandora_legacy.css
View File

@ -935,6 +935,12 @@ div#logo_text3 {
.datos_grey, .datos_greyf9 {
background-color: #E4E4E4;
}
.datos_sky, .datos_skyf9 {
background-color: #cdfffc;
}
.datos_pink, .datos_pinkf9 {
background-color: #F39DE2;
}
td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9 {
padding: 5px 5px 5px 5px;
}

6
pandora_console/operation/events/events_list.php
View File

@ -697,6 +697,12 @@ foreach ($result as $event) {
case 4:
$img_sev = "images/status_sets/default/severity_critical.png";
break;
case 5:
$img_sev = "images/status_sets/default/severity_minor.png";
break;
case 6:
$img_sev = "images/status_sets/default/severity_major.png";
break;
}
if (in_array('evento', $show_fields)) {

2
pandora_console/pandoradb.oracle.sql
View File

@ -542,7 +542,7 @@ CREATE TABLE tevento (
critical_instructions VARCHAR2(255) default '',
warning_instructions VARCHAR2(255) default '',
unknown_instructions VARCHAR2(255) default '',
CONSTRAINT tevento_event_type_cons CHECK (event_type IN ('unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change'))
CONSTRAINT tevento_event_type_cons CHECK (event_type IN ('going_unknown','unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change'))
);
CREATE INDEX tevento_id_1_idx ON tevento(id_agente, id_evento);
CREATE INDEX tevento_id_2_idx ON tevento(utimestamp, id_evento);

2
pandora_console/pandoradb.postgreSQL.sql
View File

@ -422,7 +422,7 @@ CREATE TABLE "tconfig_os" (
"icon_name" varchar(100) default ''
);
CREATE TYPE type_tevento_event AS ENUM ('unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change');
CREATE TYPE type_tevento_event AS ENUM ('going_unknown','unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change');
CREATE TABLE "tevento" (
"id_evento" BIGSERIAL NOT NULL PRIMARY KEY,
"id_agente" INTEGER NOT NULL default 0,

2
pandora_console/pandoradb.sql
View File

@ -510,7 +510,7 @@ CREATE TABLE IF NOT EXISTS `tevento` (
`timestamp` datetime NOT NULL default '1970-01-01 00:00:00',
`evento` text NOT NULL,
`utimestamp` bigint(20) NOT NULL default '0',
`event_type` enum('unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change') default 'unknown',
`event_type` enum('going_unknown','unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change') default 'unknown',
`id_agentmodule` int(10) NOT NULL default '0',
`id_alert_am` int(10) NOT NULL default '0',
`criticity` int(4) unsigned NOT NULL default '0',