From f8c2c3bf29ad84397d58f93e34b1d61345a551fb Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 13 Sep 2012 14:06:08 +0000 Subject: [PATCH] 2012-09-13 Sergio Martin * 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 --- pandora_console/ChangeLog | 19 ++++++++++++ .../pandoradb_migrate_4.0.x_to_5.0.mysql.sql | 1 + .../pandoradb_migrate_4.0.x_to_5.0.oracle.sql | 1 + ...doradb_migrate_4.0.x_to_5.0.postgreSQL.sql | 1 + .../skin_default/include/styles/pandora.css | 29 ++++++++++++++++++ .../status_sets/default/severity_major.png | Bin 0 -> 348 bytes .../default/severity_major_pixel.png | Bin 0 -> 172 bytes .../status_sets/default/severity_minor.png | Bin 0 -> 331 bytes .../default/severity_minor_pixel.png | Bin 0 -> 172 bytes pandora_console/include/functions.php | 13 ++++++++ pandora_console/include/styles/pandora.css | 6 ++++ .../include/styles/pandora_legacy.css | 6 ++++ .../operation/events/events_list.php | 6 ++++ pandora_console/pandoradb.oracle.sql | 2 +- pandora_console/pandoradb.postgreSQL.sql | 2 +- pandora_console/pandoradb.sql | 2 +- 16 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 pandora_console/images/status_sets/default/severity_major.png create mode 100644 pandora_console/images/status_sets/default/severity_major_pixel.png create mode 100644 pandora_console/images/status_sets/default/severity_minor.png create mode 100644 pandora_console/images/status_sets/default/severity_minor_pixel.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 48bdc13fc9..a3b334d66e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,22 @@ +2012-09-13 Sergio Martin + + * 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 * operation/events/events_list.php: Display instructions for diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql index aaceb73955..bb82084f06 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql @@ -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` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql index 5d535681b0..505bb2bfb0 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql @@ -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` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql index f821004853..d80d8fee3d 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql @@ -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` diff --git a/pandora_console/images/skin/skin_default/include/styles/pandora.css b/pandora_console/images/skin/skin_default/include/styles/pandora.css index 1efff50801..28df29f304 100644 --- a/pandora_console/images/skin/skin_default/include/styles/pandora.css +++ b/pandora_console/images/skin/skin_default/include/styles/pandora.css @@ -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; diff --git a/pandora_console/images/status_sets/default/severity_major.png b/pandora_console/images/status_sets/default/severity_major.png new file mode 100644 index 0000000000000000000000000000000000000000..826c42c1eb792afed8fecacf5e9714974600bb6f GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}Y)RhkE)4%c zaKYZ?lYt_f1s;*bK<(E-n9)gNb_Gz7y~NYkmHiGUFE^*m{3A#91BLE*x;TbtoS!<$ z(C@H=fb0GEMhm7bud8<~?w+EdI?2-Y+(Att&84i1OhVr!Za*ow#^slYoIBqk*MDKw z#=rlcn}6}?mPZeNPVRem@`vb(hDnU<3F=o;it6q31RcC*H}WUwwiwn2FwbsU6m0Om z^;%$tBBO*fThKzOieT^E4EvN%)EmeZce8{P8h$QVv0r@w58K&L|9uf^?_9WEA7gu7 zRiGg&v|+c_`Q$UXlLLh99zU!&Wi!(=_s?Xbo$O{#r8|~Za4hKPZGK&9r&n3?bJx1I lfYh4JQVziZU#4H~ir;=U_M%avM?TP>44$rjF6*2UngE*ygk44ofy`glX(f`a29w(7Bet# z3xhBt!>lCBD!6<42E0#E%>ybF^>lFzk+__^=X}9@M)QQE1Ke(_Oc>NS7%y!<^IH~~tVe2>F zzu)k8V7?;qra?EzJ(PF(VJ5~4-z6&;!#ol`GwW_pd>(i3PurF*CuLEk+X731xYxMe zKi_zs>#g|tk@mfx|ne1tPT6uvz0utnbYsB Zw{&0ZMb5%?i9nAsc)I$ztaD0e0sv*8ftUaQ literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/severity_minor_pixel.png b/pandora_console/images/status_sets/default/severity_minor_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..fd3c71d3aa941f77f06de90e32ce8a5256a1aae5 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ihk44ofy`glX(f`a29w(7Bet# z3xhBt!>lbP0l+XkK#xyOO literal 0 HcmV?d00001 diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index e7149c45f2..3e21e86076 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -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; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 0541df6f0d..9d844eb97a 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -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; } diff --git a/pandora_console/include/styles/pandora_legacy.css b/pandora_console/include/styles/pandora_legacy.css index 2b69829911..f60ca8b328 100644 --- a/pandora_console/include/styles/pandora_legacy.css +++ b/pandora_console/include/styles/pandora_legacy.css @@ -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; } diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index bd38097657..f6c8ae707c 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -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)) { diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index cc2800087d..31960ad7a0 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -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); diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index 8395a249e1..1d54b71427 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -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, diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index ac92b387f8..69b3751050 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -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',