diff --git a/pandora_console/extras/mr/51.sql b/pandora_console/extras/mr/51.sql index 46696d9f83..14fa6d29ec 100644 --- a/pandora_console/extras/mr/51.sql +++ b/pandora_console/extras/mr/51.sql @@ -1,5 +1,6 @@ START TRANSACTION; ALTER TABLE `tncm_vendor` ADD COLUMN `icon` VARCHAR(255) DEFAULT ''; +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', 'ncm') DEFAULT 'unknown'; COMMIT; diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 90d2dfd984..9b617af6aa 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1234,6 +1234,7 @@ function get_event_types($id_type=false) $types['system'] = __('System'); $types['error'] = __('Error'); $types['configuration_change'] = __('Configuration change'); + $types['ncm'] = __('Network configuration manager'); // This types are impersonated by the monitor 'x' types // $types['going_up_normal'] = __('Going Normal'); diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 5e1888f1f3..2b6fc6982a 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -3245,6 +3245,10 @@ function events_get_event_types($type_id) $type_desc = __('Not normal'); break; + case 'ncm': + $type_desc = __('Network configuration manager'); + break; + default: if (isset($config['text_char_long'])) { foreach ($diferent_types as $key => $type) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index bb4193a9b7..aa509d94fa 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2748,7 +2748,8 @@ function ui_print_module_status( $output = '
'; + $output .= ' forced_title" data-title="'.$title.'" title="'; + $output .= $title.'" data-use_title_for_force_title="1">'; if ($return === false) { echo $output; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index c81d311d1a..8b6115522b 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -813,6 +813,9 @@ select:-internal-list-box { padding: 0.2em; box-shadow: 0 0 10px -5px #d1d1d1; } +.button-soft-border.icon { + width: 1.5em; +} .button-soft-border:hover { box-shadow: 0 0 10px 0px #d1d1d1; } diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 62cec84dfc..623858c146 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -680,7 +680,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('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', + `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', 'ncm') 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',