wip ncm2
This commit is contained in:
parent
ee09470962
commit
9ff3c8eee1
|
@ -1,5 +1,6 @@
|
||||||
START TRANSACTION;
|
START TRANSACTION;
|
||||||
|
|
||||||
ALTER TABLE `tncm_vendor` ADD COLUMN `icon` VARCHAR(255) DEFAULT '';
|
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;
|
COMMIT;
|
||||||
|
|
|
@ -1234,6 +1234,7 @@ function get_event_types($id_type=false)
|
||||||
$types['system'] = __('System');
|
$types['system'] = __('System');
|
||||||
$types['error'] = __('Error');
|
$types['error'] = __('Error');
|
||||||
$types['configuration_change'] = __('Configuration change');
|
$types['configuration_change'] = __('Configuration change');
|
||||||
|
$types['ncm'] = __('Network configuration manager');
|
||||||
|
|
||||||
// This types are impersonated by the monitor 'x' types
|
// This types are impersonated by the monitor 'x' types
|
||||||
// $types['going_up_normal'] = __('Going Normal');
|
// $types['going_up_normal'] = __('Going Normal');
|
||||||
|
|
|
@ -3245,6 +3245,10 @@ function events_get_event_types($type_id)
|
||||||
$type_desc = __('Not normal');
|
$type_desc = __('Not normal');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'ncm':
|
||||||
|
$type_desc = __('Network configuration manager');
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if (isset($config['text_char_long'])) {
|
if (isset($config['text_char_long'])) {
|
||||||
foreach ($diferent_types as $key => $type) {
|
foreach ($diferent_types as $key => $type) {
|
||||||
|
|
|
@ -2748,7 +2748,8 @@ function ui_print_module_status(
|
||||||
|
|
||||||
$output = '<div style="background: '.$color;
|
$output = '<div style="background: '.$color;
|
||||||
$output .= '" class="'.$class;
|
$output .= '" class="'.$class;
|
||||||
$output .= '" title="'.$title.'"></div>';
|
$output .= ' forced_title" data-title="'.$title.'" title="';
|
||||||
|
$output .= $title.'" data-use_title_for_force_title="1"></div>';
|
||||||
|
|
||||||
if ($return === false) {
|
if ($return === false) {
|
||||||
echo $output;
|
echo $output;
|
||||||
|
|
|
@ -813,6 +813,9 @@ select:-internal-list-box {
|
||||||
padding: 0.2em;
|
padding: 0.2em;
|
||||||
box-shadow: 0 0 10px -5px #d1d1d1;
|
box-shadow: 0 0 10px -5px #d1d1d1;
|
||||||
}
|
}
|
||||||
|
.button-soft-border.icon {
|
||||||
|
width: 1.5em;
|
||||||
|
}
|
||||||
.button-soft-border:hover {
|
.button-soft-border:hover {
|
||||||
box-shadow: 0 0 10px 0px #d1d1d1;
|
box-shadow: 0 0 10px 0px #d1d1d1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -680,7 +680,7 @@ CREATE TABLE IF NOT EXISTS `tevento` (
|
||||||
`timestamp` datetime NOT NULL default '1970-01-01 00:00:00',
|
`timestamp` datetime NOT NULL default '1970-01-01 00:00:00',
|
||||||
`evento` text NOT NULL,
|
`evento` text NOT NULL,
|
||||||
`utimestamp` bigint(20) NOT NULL default '0',
|
`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_agentmodule` int(10) NOT NULL default '0',
|
||||||
`id_alert_am` int(10) NOT NULL default '0',
|
`id_alert_am` int(10) NOT NULL default '0',
|
||||||
`criticity` int(4) unsigned NOT NULL default '0',
|
`criticity` int(4) unsigned NOT NULL default '0',
|
||||||
|
|
Loading…
Reference in New Issue