10454-Fix filters

This commit is contained in:
Pablo Aragon 2023-02-24 10:06:32 +01:00
commit a28eb59ce0
19 changed files with 1062 additions and 706 deletions

View File

@ -122,8 +122,6 @@ if ($fields_selected[0] != '') {
}
}
echo '<h3>'.__('Show monitor detail fields').'</h3>';
$table = new stdClass();
$table->width = '100%';
$table->class = 'databox filters';
@ -161,6 +159,12 @@ foreach ($fields_available as $key => $available) {
}
}
// General title.
$generalTitleContent = [];
$generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true);
$generalTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Show monitor detail fields')], true);
$titledata[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $generalTitleContent) ], true);
$table->data['general_title'] = $titledata;
$table->data[0][0] = '<b>'.__('Fields available').'</b>';
$table->data[1][0] = html_print_select($fields_available, 'fields_available[]', true, '', '', 0, true, true, false, '', false, 'width: 300px');
$table->data[1][1] = '<a href="javascript:">'.html_print_image(
@ -202,19 +206,18 @@ $table->data[1][2] = html_print_select(
echo '<form id="custom_status_monitor" method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields&amp;pure='.$config['pure'].'">';
html_print_table($table);
html_print_div(
[
'class' => 'action-buttons w100p',
'content' => html_print_submit_button(
__('Update'),
'update_button',
false,
[ 'icon' => 'update' ],
true
),
]
html_print_action_buttons(
html_print_submit_button(
__('Update'),
'update_button',
false,
[ 'icon' => 'update' ],
true
)
);
echo '</form>';
?>
<script type="text/javascript">

View File

@ -220,7 +220,7 @@ if ($edit_filter > -2) {
if ($j == 1) {
$table->data[$j][1] .= ui_print_help_tip(__('This field contains a substring, could be part of a IP address, a numeric OID, or a plain substring').SEPARATOR_COLUMN, true);
} else {
$table->data[$j][1] .= html_print_image('images/cross.png', true, ['id' => 'delete_filter_'.$f['id_snmp_filter'], 'class' => 'invert_filter', 'alt' => __('Click to remove the filter')]);
$table->data[$j][1] .= html_print_image('images/delete.svg', true, ['id' => 'delete_filter_'.$f['id_snmp_filter'], 'class' => 'invert_filter main_menu_icon', 'alt' => __('Click to remove the filter')]);
}
$j++;
@ -298,7 +298,7 @@ if ($edit_filter > -2) {
$data = [];
$data[0] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$r['id_snmp_filter'].'">'.$r['description'].'</a>';
$data[1] = $r['filter'];
$data[2] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$r['id_snmp_filter'].'">'.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Update'), 'class' => 'invert_filter']).'</a>'.'&nbsp;&nbsp;<a onclick="if (confirm(\''.__('Are you sure?').'\')) return true; else return false;" href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&delete_filter='.$r['id_snmp_filter'].'">'.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete'), 'class' => 'invert_filter']).'</a>';
$data[2] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$r['id_snmp_filter'].'">'.html_print_image('images/support@svg.svg', true, ['border' => '0', 'alt' => __('Update'), 'class' => 'invert_filter main_menu_icon']).'</a>'.'&nbsp;&nbsp;<a onclick="if (confirm(\''.__('Are you sure?').'\')) return true; else return false;" href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&delete_filter='.$r['id_snmp_filter'].'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'alt' => __('Delete'), 'class' => 'invert_filter main_menu_icon']).'</a>';
array_push($table->data, $data);
}
} else {
@ -309,7 +309,7 @@ if ($edit_filter > -2) {
foreach ($row as $i => $r) {
if ($ind2 == 0) {
$compose_id = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$r['id_snmp_filter'].'">'.$r['description'].'</a>';
$compose_action = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$r['id_snmp_filter'].'">'.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Update'), 'class' => 'invert_filter']).'</a>'.'&nbsp;&nbsp;<a onclick="if (confirm(\''.__('Are you sure?').'\')) return true; else return false;" href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&delete_filter='.$r['id_snmp_filter'].'">'.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete'), 'class' => 'invert_filter']).'</a>';
$compose_action = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$r['id_snmp_filter'].'">'.html_print_image('images/support@svg.svg', true, ['border' => '0', 'alt' => __('Update'), 'class' => 'invert_filter main_menu_icon']).'</a>'.'&nbsp;&nbsp;<a onclick="if (confirm(\''.__('Are you sure?').'\')) return true; else return false;" href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&delete_filter='.$r['id_snmp_filter'].'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'alt' => __('Delete'), 'class' => 'invert_filter main_menu_icon']).'</a>';
$ind2++;
}
@ -333,7 +333,20 @@ if ($edit_filter > -2) {
echo '<div class="right w100p">';
echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter=-1">';
html_print_submit_button(__('Create'), 'submit_button', false, 'class="sub next"');
html_print_action_buttons(
html_print_submit_button(
__('Create'),
'crt',
false,
[ 'icon' => 'next' ],
true
),
[
'type' => 'data_table',
'class' => 'fixed_action_buttons',
]
);
echo '</form></div>';
}
?>
@ -345,7 +358,7 @@ if ($edit_filter > -2) {
$(document).ready (function () {
$('#add_filter').click(function(e) {
$('#filter_table').append('<tr id="filter_table-' + id + '" class="datos"><td id="filter_table-' + id + '-0" class="datos "></td><td id="filter_table-' + id + '-1" class="datos "><input type="text" name="filter_' + id + '" value="" id="text-filter_' + id + '" size="60" maxlength="100"><img src="' + homeurl + 'images/cross.png" onclick="delete_this_row(' + id + ');" data-title="Click to delete the filter" data-use_title_for_force_title="1" class="forced_title" alt="Click to delete the filter"></td></tr>');
$('#filter_table').append('<tr id="filter_table-' + id + '" class="datos"><td id="filter_table-' + id + '-0" class="datos "></td><td id="filter_table-' + id + '-1" class="datos "><input type="text" name="filter_' + id + '" value="" id="text-filter_' + id + '" size="60" maxlength="100"><img src="' + homeurl + 'images/delete.svg" onclick="delete_this_row(' + id + ');" data-title="Click to delete the filter" data-use_title_for_force_title="1" class="forced_title main_menu_icon" alt="Click to delete the filter"></td></tr>');
id++;

View File

@ -79,69 +79,84 @@ if ($generate_trap) {
$table = new stdClass();
$traps_generator = '<form method="POST" action="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_trap_generator">';
$table->width = '100%';
$table->class = 'databox filters';
$table->class = 'filter-table-adv';
$table->size = [];
$table->data = [];
$table->size[0] = '30%';
$table->size[1] = '30%';
$table->size[2] = '30%';
$table->data[0][0] = __('Host address');
$table->data[0][1] = html_print_input_text(
'snmp_host_address',
$snmp_host_address,
'',
50,
255,
true
$table->data[0][0] = html_print_label_input_block(
__('Host address'),
html_print_input_text(
'snmp_host_address',
$snmp_host_address,
'',
50,
255,
true
)
);
$table->data[0][2] = __('Community');
$table->data[0][3] = html_print_input_text(
'snmp_community',
$snmp_community,
'',
50,
255,
true
$table->data[0][1] = html_print_label_input_block(
__('Community'),
html_print_input_text(
'snmp_community',
$snmp_community,
'',
50,
255,
true
)
);
$table->data[2][0] = __('Enterprise String');
$table->data[2][1] = html_print_input_text(
'snmp_oid',
$snmp_oid,
'',
50,
255,
true
$table->data[0][2] = html_print_label_input_block(
__('Enterprise String'),
html_print_input_text(
'snmp_oid',
$snmp_oid,
'',
50,
255,
true
)
);
$table->data[2][2] = __('Value');
$table->data[2][3] = html_print_input_text(
'snmp_value',
$snmp_value,
'',
50,
255,
true
$table->data[1][1] = html_print_label_input_block(
__('Value'),
html_print_input_text(
'snmp_value',
$snmp_value,
'',
50,
255,
true
)
);
$table->data[3][0] = __('SNMP Agent');
$table->data[3][1] = html_print_input_text(
'snmp_agent',
$snmp_agent,
'',
50,
255,
true
);
$table->data[3][2] = __('SNMP Type');
$table->data[3][3] = html_print_input_text(
'snmp_type',
$snmp_type,
'',
50,
255,
true
$table->data[1][2] = html_print_label_input_block(
__('SNMP Agent'),
html_print_input_text(
'snmp_agent',
$snmp_agent,
'',
50,
255,
true
)
);
/*
$table->data[1][3] = html_print_label_input_block(
__('SNMP Type'),
html_print_input_text(
'snmp_type',
$snmp_type,
'',
50,
255,
true
)
);*/
$types = [
0 => 'Cold start (0)',
@ -152,24 +167,50 @@ $types = [
5 => 'EGP neighbor loss (5)',
6 => 'Enterprise (6)',
];
$table->data[3][3] = html_print_select(
$types,
'snmp_type',
$snmp_type,
'',
__('Select'),
-1,
true,
false,
false
$table->data[1][3] = html_print_label_input_block(
__('SNMP Type'),
html_print_select(
$types,
'snmp_type',
$snmp_type,
'',
__('Select'),
-1,
true,
false,
false,
'',
false,
'width: 100%'
)
);
$searchForm = '<form method="POST" action="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_trap_generator">';
$searchForm .= html_print_table($table, true);
$searchForm .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Generate trap'),
'btn_generate_trap',
false,
['class' => 'sub cog'],
true
),
],
true
);
$searchForm .= html_print_input_hidden('generate_trap', 1, true);
$searchForm .= '</form>';
$traps_generator .= html_print_table($table, true);
$traps_generator .= '<div style="width:'.$table->width.'; text-align: right;">'.html_print_submit_button(__('Generate trap'), 'btn_generate_trap', false, 'class="sub cog"', true).'</div>';
$traps_generator .= html_print_input_hidden('generate_trap', 1, true);
unset($table);
$traps_generator .= '</form>';
echo $traps_generator;
ui_toggle(
$searchForm,
'<span class="subsection_header_title">'.__('Trap').'</span>',
'filter_form',
'',
false,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);

View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: sketchtool 61.2 (101010) - https://sketch.com -->
<title>EF4DAB07-B64C-4C55-97AB-23DF4EA7EF22@svg</title>
<desc>Created with sketchtool.</desc>
<g id="Login---v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Mockup---login-v4h" transform="translate(-162.000000, -25.000000)" fill="#8190AD">
<g id="Extra-links" transform="translate(20.000000, 20.000000)">
<g id="Group" transform="translate(142.000000, 5.000000)">
<g id="Support">
<path fill="#3F3F3F" d="M15.2701641,-1.77635684e-15 C15.4858494,-1.27409902e-15 15.6979436,0.0348396041 15.8989225,0.101403078 L12.7070316,3.29366835 C12.3167579,3.68432574 12.3167579,4.31737481 12.7070316,4.7080322 L14.6666667,6.66808379 L15.2912682,7.29281808 C15.6515751,7.65347905 16.2187925,7.68127953 16.6111153,7.37629716 L16.7053314,7.29311863 C16.7053816,7.29306854 16.7054316,7.29301844 16.7053314,7.29281808 L19.898705,4.10024399 C19.9485744,4.25090439 19.9806182,4.40780887 19.9935232,4.56778861 L20,4.72867607 L20,9.00123799 L16.0046868,13 L10.9984579,13 L10.497,12.499 L2.98434067,19.9968645 L0,19.9968645 L0,16.9968645 L7.499,9.5 L7,9.00123799 L7,4.00313044 L10.9984579,-1.77635684e-15 L15.2701641,-1.77635684e-15 Z"></path>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -772,10 +772,19 @@ class Tree
if ((bool) $module['alerts']) {
// Module has alerts triggered.
if ($module_alert_triggered === true) {
$module['alertsImageHTML'] = html_print_image('images/bell_orange.png', true, ['title' => __('Module alerts'), 'style' => 'filter: initial']);
$colorAlertButton = COL_ALERTFIRED;
} else {
$module['alertsImageHTML'] = html_print_image('images/bell_green.png', true, ['title' => __('Module alerts'), 'style' => 'filter: initial']);
$colorAlertButton = COL_NORMAL;
}
$module['alertsImageHTML'] = html_print_div(
[
'title' => __('Module alerts'),
'class' => 'alert_background_state main_menu_icon module-button',
'style' => 'background-color: '.$colorAlertButton,
],
true
);
}
}

View File

@ -752,7 +752,7 @@ function filemanager_file_explorer(
&& ($readOnly === false)
) {
$data[4] .= '<form method="post" action="'.$url.'" style="">';
$data[4] .= '<input type="image" class="invert_filter" src="images/cross.png" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[4] .= '<input type="image" style="margin-top: 2px;height:21px" class="invert_filter" src="images/delete.svg" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[4] .= html_print_input_hidden('filename', $fileinfo['realpath'], true);
$data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'].$config['server_unique_identifier']), true);
$data[4] .= html_print_input_hidden('delete_file', 1, true);
@ -857,7 +857,7 @@ function filemanager_file_explorer(
$createFolderElements = $tabs_dialog;
$createFolderElements .= sprintf('<form method="POST" action="%s">', $url);
$createFolderElements .= html_print_input_text('dirname', '', '', 30, 255, true);
$createFolderElements .= html_print_submit_button(__('Create'), 'crt', false, 'class="sub next"', true);
$createFolderElements .= html_print_submit_button(__('Create'), 'crt', false, 'class="submitButton"', true);
$createFolderElements .= html_print_input_hidden('directory', $relative_directory, true);
$createFolderElements .= html_print_input_hidden('create_dir', 1, true);
$createFolderElements .= html_print_input_hidden('hash', md5($relative_directory.$config['server_unique_identifier']), true);
@ -897,7 +897,7 @@ function filemanager_file_explorer(
$uploadFileElements .= html_print_input_hidden('upload_file', 1, true);
}
$uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, 'class="sub next"', true);
$uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, 'class="mrgn_lft_10px submitButton" style="display: inline;"', true);
$uploadFileElements .= html_print_input_hidden('real_directory', $real_directory, true);
$uploadFileElements .= html_print_input_hidden('directory', $relative_directory, true);
$uploadFileElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true);
@ -918,7 +918,7 @@ function filemanager_file_explorer(
$createTextElements = $tabs_dialog;
$createTextElements .= '<form method="post" action="'.$url.'">';
$createTextElements .= html_print_input_text('name_file', '', '', 30, 50, true);
$createTextElements .= html_print_submit_button(__('Create'), 'create', false, 'class="sub next"', true);
$createTextElements .= html_print_submit_button(__('Create'), 'create', false, 'class="submitButton"', true);
$createTextElements .= html_print_input_hidden('real_directory', $real_directory, true);
$createTextElements .= html_print_input_hidden('directory', $relative_directory, true);
$createTextElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true);

View File

@ -11965,7 +11965,7 @@ function reporting_get_stats_alerts($data, $links=false)
$table_al = html_get_predefined_table();
$tdata = [];
$tdata[0] = html_print_image('images/bell.png', true, ['title' => __('Defined alerts'), 'class' => 'invert_filter'], false, false, false, true);
$tdata[0] = html_print_image('images/alert@svg.svg', true, ['title' => __('Defined alerts'), 'class' => 'main_menu_icon invert_filter'], false, false, false, true);
$tdata[1] = $data['monitor_alerts'] <= 0 ? '-' : $data['monitor_alerts'];
$tdata[1] = '<a class="big_data" href="'.$urls['monitor_alerts'].'">'.$tdata[1].'</a>';
@ -11976,10 +11976,19 @@ function reporting_get_stats_alerts($data, $links=false)
*/
if ($data['monitor_alerts'] > $data['total_agents'] && !enterprise_installed()) {
$tdata[2] = "<div id='alertagentmodal' class='publienterprise' title='Community version' ><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
$tdata[2] = "<div id='alertagentmodal' class='publienterprise' title='Community version' ><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title main_menu_icon' data-use_title_for_force_title='1' src='images/alert-yellow@svg.svg'></div>";
}
$tdata[3] = html_print_image(
$tdata[3] = html_print_div(
[
'title' => __('Fired alerts'),
'style' => 'background-color: '.COL_CRITICAL,
'class' => 'alert_background_state main_menu_icon invert_filter',
],
true
);
/*
html_print_image(
'images/bell_error.png',
true,
[
@ -11990,7 +11999,7 @@ function reporting_get_stats_alerts($data, $links=false)
false,
false,
true
);
);*/
$tdata[4] = $data['monitor_alerts_fired'] <= 0 ? '-' : $data['monitor_alerts_fired'];
$tdata[4] = '<a style="color: '.COL_ALERTFIRED.';" class="big_data" href="'.$urls['monitor_alerts_fired'].'">'.$tdata[4].'</a>';
$table_al->rowclass[] = '';
@ -12041,29 +12050,29 @@ function reporting_get_stats_modules_status($data, $graph_width=250, $graph_heig
$table_mbs = html_get_predefined_table();
$tdata = [];
$tdata[0] = html_print_image('images/module_critical.png', true, ['title' => __('Monitor critical')], false, false, false, true);
$tdata[0] = html_print_div(['class' => 'main_menu_icon module_background_state', 'style' => 'background-color: '.COL_CRITICAL, 'title' => __('Monitor critical')], true);
$tdata[1] = $data['monitor_critical'] <= 0 ? '-' : $data['monitor_critical'];
$tdata[1] = '<a style="color: '.COL_CRITICAL.';" class="big_data line_heigth_initial" href="'.$urls['monitor_critical'].'">'.$tdata[1].'</a>';
$tdata[2] = html_print_image('images/module_warning.png', true, ['title' => __('Monitor warning')], false, false, false, true);
$tdata[2] = html_print_div(['class' => 'main_menu_icon module_background_state', 'style' => 'background-color: '.COL_WARNING_DARK, 'title' => __('Monitor warning')], true);
$tdata[3] = $data['monitor_warning'] <= 0 ? '-' : $data['monitor_warning'];
$tdata[3] = '<a style="color: '.COL_WARNING_DARK.';" class="big_data line_heigth_initial" href="'.$urls['monitor_warning'].'">'.$tdata[3].'</a>';
$table_mbs->rowclass[] = '';
$table_mbs->data[] = $tdata;
$tdata = [];
$tdata[0] = html_print_image('images/module_ok.png', true, ['title' => __('Monitor normal')], false, false, false, true);
$tdata[0] = html_print_div(['class' => 'main_menu_icon module_background_state', 'style' => 'background-color: '.COL_NORMAL, 'title' => __('Monitor normal')], true);
$tdata[1] = $data['monitor_ok'] <= 0 ? '-' : $data['monitor_ok'];
$tdata[1] = '<a style="color: '.COL_NORMAL.';" class="big_data" href="'.$urls['monitor_ok'].'">'.$tdata[1].'</a>';
$tdata[2] = html_print_image('images/module_unknown.png', true, ['title' => __('Monitor unknown')], false, false, false, true);
$tdata[2] = html_print_div(['class' => 'main_menu_icon module_background_state', 'style' => 'background-color: '.COL_UNKNOWN, 'title' => __('Monitor unknown')], true);
$tdata[3] = $data['monitor_unknown'] <= 0 ? '-' : $data['monitor_unknown'];
$tdata[3] = '<a style="color: '.COL_UNKNOWN.';" class="big_data line_heigth_initial" href="'.$urls['monitor_unknown'].'">'.$tdata[3].'</a>';
$table_mbs->rowclass[] = '';
$table_mbs->data[] = $tdata;
$tdata = [];
$tdata[0] = html_print_image('images/module_notinit.png', true, ['title' => __('Monitor not init')], false, false, false, true);
$tdata[0] = html_print_div(['class' => 'main_menu_icon module_background_state', 'style' => 'background-color: '.COL_NOTINIT, 'title' => __('Monitor not init')], true);
$tdata[1] = $data['monitor_not_init'] <= 0 ? '-' : $data['monitor_not_init'];
$tdata[1] = '<a style="color: '.COL_NOTINIT.';" class="big_data line_heigth_initial" href="'.$urls['monitor_not_init'].'">'.$tdata[1].'</a>';
@ -12122,7 +12131,7 @@ function reporting_get_stats_agents_monitors($data)
$table_am = html_get_predefined_table();
$tdata = [];
$tdata[0] = html_print_image('images/agent.png', true, ['title' => __('Total agents'), 'class' => 'invert_filter'], false, false, false, true);
$tdata[0] = html_print_image('images/agents@svg.svg', true, ['title' => __('Total agents'), 'class' => 'invert_filter main_menu_icon'], false, false, false, true);
$tdata[1] = $data['total_agents'] <= 0 ? '-' : $data['total_agents'];
$tdata[1] = '<a class="big_data" href="'.$urls['total_agents'].'">'.$tdata[1].'</a>';
@ -12133,10 +12142,10 @@ function reporting_get_stats_agents_monitors($data)
*/
if ($data['total_agents'] > 500 && !enterprise_installed()) {
$tdata[2] = "<div id='agentsmodal' class='publienterprise' title='".__('Enterprise version not installed')."'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
$tdata[2] = "<div id='agentsmodal' class='publienterprise' title='".__('Enterprise version not installed')."'><img data-title='Enterprise version' class='img_help forced_title main_menu_icon' data-use_title_for_force_title='1' src='images/alert-yellow@svg.svg'></div>";
}
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Monitor checks'), 'class' => 'invert_filter'], false, false, false, true);
$tdata[3] = html_print_image('images/modules@svg.svg', true, ['title' => __('Monitor checks'), 'class' => 'main_menu_icon invert_filter'], false, false, false, true);
$tdata[4] = $data['monitor_total'] <= 0 ? '-' : $data['monitor_total'];
$tdata[4] = '<a class="big_data" href="'.$urls['monitor_total'].'">'.$tdata[4].'</a>';
@ -12147,7 +12156,7 @@ function reporting_get_stats_agents_monitors($data)
*/
if ($data['total_agents']) {
if (($data['monitor_total'] / $data['total_agents'] > 100) && !enterprise_installed()) {
$tdata[5] = "<div id='monitorcheckmodal' class='publienterprise' title='Community version' ><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
$tdata[5] = "<div id='monitorcheckmodal' class='publienterprise' title='Community version' ><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title main_menu_icon' data-use_title_for_force_title='1' src='images/alert-yellow@svg.svg'></div>";
}
}
@ -12177,7 +12186,7 @@ function reporting_get_stats_users($data)
$table_us = html_get_predefined_table();
$tdata = [];
$tdata[0] = html_print_image('images/user.png', true, ['title' => __('Defined users'), 'class' => 'invert_filter']);
$tdata[0] = html_print_image('images/user.svg', true, ['title' => __('Defined users'), 'class' => 'main_menu_icon invert_filter']);
$user_is_admin = users_is_admin();
$users = [];
@ -14453,10 +14462,10 @@ function reporting_get_stats_servers()
$table_srv->style[1] = $table_srv->style[3] = 'text-align: left; padding: 5px;';
$tdata = [];
$tdata[0] = html_print_image('images/module.png', true, ['title' => __('Total running modules'), 'class' => 'invert_filter']);
$tdata[0] = html_print_image('images/modules@svg.svg', true, ['title' => __('Total running modules'), 'class' => 'main_menu_icon invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['total_modules_rate'], 2).'</span>';
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>';
$tdata[3] = html_print_image('images/modules@svg.svg', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'main_menu_icon invert_filter']).'/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
@ -14468,25 +14477,25 @@ function reporting_get_stats_servers()
$table_srv->data[] = $tdata;
$tdata = [];
$tdata[0] = html_print_image('images/database.png', true, ['title' => __('Local modules'), 'class' => 'invert_filter']);
$tdata[0] = html_print_image('images/data-server@svg.svg', true, ['title' => __('Local modules'), 'class' => 'main_menu_icon invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_local_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['local_modules_rate'], 2).'</span>';
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>';
$tdata[3] = html_print_image('images/modules@svg.svg', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'main_menu_icon invert_filter']).'/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
if (isset($server_performance['total_network_modules'])) {
$tdata = [];
$tdata[0] = html_print_image('images/network.png', true, ['title' => __('Network modules'), 'class' => 'invert_filter']);
$tdata[0] = html_print_image('images/network@svg.svg', true, ['title' => __('Network modules'), 'class' => 'main_menu_icon invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_network_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['network_modules_rate'], 2).'</span>';
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>';
$tdata[3] = html_print_image('images/modules@svg.svg', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'main_menu_icon invert_filter']).'/sec </span>';
if ($server_performance['total_remote_modules'] > 10000 && !enterprise_installed()) {
$tdata[4] = "<div id='remotemodulesmodal' class='publienterprise left' title='Community version'><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
$tdata[4] = "<div id='remotemodulesmodal' class='publienterprise left' title='Community version'><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title main_menu_icon' data-use_title_for_force_title='1' src='images/alert-yellow@svg.svg'></div>";
} else {
$tdata[4] = '&nbsp;';
}
@ -14497,11 +14506,11 @@ function reporting_get_stats_servers()
if (isset($server_performance['total_plugin_modules'])) {
$tdata = [];
$tdata[0] = html_print_image('images/plugin.png', true, ['title' => __('Plugin modules'), 'class' => 'invert_filter']);
$tdata[0] = html_print_image('images/plugins@svg.svg', true, ['title' => __('Plugin modules'), 'class' => 'main_menu_icon invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_plugin_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['plugin_modules_rate'], 2).'</span>';
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>';
$tdata[3] = html_print_image('images/modules@svg.svg', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'main_menu_icon invert_filter']).'/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
@ -14509,11 +14518,11 @@ function reporting_get_stats_servers()
if (isset($server_performance['total_prediction_modules'])) {
$tdata = [];
$tdata[0] = html_print_image('images/chart_bar.png', true, ['title' => __('Prediction modules'), 'class' => 'invert_filter']);
$tdata[0] = html_print_image('images/prediction@svg.svg', true, ['title' => __('Prediction modules'), 'class' => 'main_menu_icon invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_prediction_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['prediction_modules_rate'], 2).'</span>';
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>';
$tdata[3] = html_print_image('images/modules@svg.svg', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'main_menu_icon invert_filter']).'/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
@ -14521,11 +14530,11 @@ function reporting_get_stats_servers()
if (isset($server_performance['total_wmi_modules'])) {
$tdata = [];
$tdata[0] = html_print_image('images/wmi.png', true, ['title' => __('WMI modules'), 'class' => 'invert_filter']);
$tdata[0] = html_print_image('images/WMI@svg.svg', true, ['title' => __('WMI modules'), 'class' => 'main_menu_icon invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_wmi_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['wmi_modules_rate'], 2).'</span>';
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>';
$tdata[3] = html_print_image('images/modules@svg.svg', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'main_menu_icon invert_filter']).'/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
@ -14533,11 +14542,11 @@ function reporting_get_stats_servers()
if (isset($server_performance['total_web_modules'])) {
$tdata = [];
$tdata[0] = html_print_image('images/world.png', true, ['title' => __('Web modules'), 'class' => 'invert_filter']);
$tdata[0] = html_print_image('images/web-analisys-data@svg.svg', true, ['title' => __('Web modules'), 'class' => 'main_menu_icon invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_web_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['web_modules_rate'], 2).'</span>';
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>';
$tdata[3] = html_print_image('images/modules@svg.svg', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'main_menu_icon invert_filter']).'/sec </span>';
$table_srv->rowclass[] = '';
$table_srv->data[] = $tdata;
@ -14551,17 +14560,17 @@ function reporting_get_stats_servers()
$tdata = [];
$tdata[0] = html_print_image(
'images/lightning_go.png',
'images/event.svg',
true,
[
'title' => __('Total events'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$tdata[1] = '<span class="big_data" id="total_events">'.html_print_image('images/spinner.gif', true).'</span>';
if (isset($system_events) && $system_events > 50000 && !enterprise_installed()) {
$tdata[2] = "<div id='monitoreventsmodal' class='publienterprise left' title='Community version'><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
$tdata[2] = "<div id='monitoreventsmodal' class='publienterprise left' title='Community version'><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title main_menu_icon' data-use_title_for_force_title='1' src='images/alert-yellow@svg.svg'></div>";
} else {
$tdata[3] = '&nbsp;';
}

View File

@ -550,11 +550,11 @@ function servers_get_info($id_server=-1)
switch ($server['server_type']) {
case SERVER_TYPE_DATA:
$server['img'] = html_print_image(
'images/database.png',
'images/data-server@svg.svg',
true,
[
'title' => __('Data server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'data';
@ -563,11 +563,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_NETWORK:
$server['img'] = html_print_image(
'images/network.png',
'images/network-server@os.svg',
true,
[
'title' => __('Network server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'network';
@ -576,11 +576,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_SNMP:
$server['img'] = html_print_image(
'images/snmp.png',
'images/snmp-trap@svg.svg',
true,
[
'title' => __('SNMP Trap server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'snmp';
@ -589,11 +589,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_DISCOVERY:
$server['img'] = html_print_image(
'images/recon.png',
'images/rrs@svg.svg',
true,
[
'title' => __('Discovery server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'recon';
@ -602,11 +602,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_PLUGIN:
$server['img'] = html_print_image(
'images/plugin.png',
'images/plugins@svg.svg',
true,
[
'title' => __('Plugin server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'plugin';
@ -615,11 +615,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_PREDICTION:
$server['img'] = html_print_image(
'images/chart_bar.png',
'images/prediction@svg.svg',
true,
[
'title' => __('Prediction server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'prediction';
@ -628,11 +628,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_WMI:
$server['img'] = html_print_image(
'images/wmi.png',
'images/WMI@svg.svg',
true,
[
'title' => __('WMI server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'wmi';
@ -641,11 +641,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_EXPORT:
$server['img'] = html_print_image(
'images/server_export.png',
'images/server-export@svg.svg',
true,
[
'title' => __('Export server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'export';
@ -654,11 +654,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_INVENTORY:
$server['img'] = html_print_image(
'images/page_white_text.png',
'images/hardware-software-component@svg.svg',
true,
[
'title' => __('Inventory server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'inventory';
@ -667,11 +667,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_WEB:
$server['img'] = html_print_image(
'images/world.png',
'images/server-web@svg.svg',
true,
[
'title' => __('Web server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'web';
@ -680,11 +680,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_EVENT:
$server['img'] = html_print_image(
'images/lightning_go.png',
'images/server-events@svg.svg',
true,
[
'title' => __('Event server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'event';
@ -693,11 +693,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_CORRELATION:
$server['img'] = html_print_image(
'images/lightning_go.png',
'images/server-events@svg.svg',
true,
[
'title' => __('Correlation server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'correlation';
@ -706,11 +706,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_ENTERPRISE_ICMP:
$server['img'] = html_print_image(
'images/network.png',
'images/network@svg.svg',
true,
[
'title' => __('Enterprise ICMP server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'enterprise icmp';
@ -719,11 +719,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_ENTERPRISE_SNMP:
$server['img'] = html_print_image(
'images/network.png',
'images/network@svg.svg',
true,
[
'title' => __('Enterprise SNMP server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'enterprise snmp';
@ -732,11 +732,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_ENTERPRISE_SATELLITE:
$server['img'] = html_print_image(
'images/satellite.png',
'images/satellite@os.svg',
true,
[
'title' => __('Enterprise Satellite server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'enterprise satellite';
@ -745,11 +745,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_ENTERPRISE_TRANSACTIONAL:
$server['img'] = html_print_image(
'images/transactional_map.png',
'images/server-transactions@svg.svg',
true,
[
'title' => __('Enterprise Transactional server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'enterprise transactional';
@ -758,11 +758,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_MAINFRAME:
$server['img'] = html_print_image(
'images/mainframe.png',
'images/mainframe@os.svg',
true,
[
'title' => __('Mainframe server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'mainframe';
@ -775,7 +775,7 @@ function servers_get_info($id_server=-1)
true,
[
'title' => __('Sync server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'sync';
@ -784,11 +784,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_WUX:
$server['img'] = html_print_image(
'images/icono-wux.png',
'images/wux@svg.svg',
true,
[
'title' => __('Wux server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'wux';
@ -797,11 +797,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_SYSLOG:
$server['img'] = html_print_image(
'images/syslog.png',
'images/logs@svg.svg',
true,
[
'title' => __('Log server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'syslog';
@ -810,11 +810,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_NCM:
$server['img'] = html_print_image(
'images/book_edit.png',
'images/custom-input@svg.svg',
true,
[
'title' => __('NCM server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'ncm';
@ -827,7 +827,7 @@ function servers_get_info($id_server=-1)
true,
[
'title' => __('Autoprovision server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'autoprovision';
@ -836,11 +836,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_MIGRATION:
$server['img'] = html_print_image(
'images/migration.png',
'images/server-export@svg.svg',
true,
[
'title' => __('Migration server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'migration';
@ -849,11 +849,11 @@ function servers_get_info($id_server=-1)
case SERVER_TYPE_ALERT:
$server['img'] = html_print_image(
'images/alerts_extern.png',
'images/alert@svg.svg',
true,
[
'title' => __('Alert server'),
'class' => 'invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$server['type'] = 'alert';

View File

@ -690,76 +690,92 @@ function snmp_browser_print_container(
global $config;
$snmp_version = get_parameter('snmp_browser_version', '2c');
// Target selection.
$table = new stdClass();
$table->width = '100%';
$table->class = 'databox filters';
$table->class = 'filter-table-adv';
$table->size = [];
$table->data = [];
$table->size[0] = '30%';
$table->size[1] = '30%';
$table->size[2] = '30%';
$table->data[0][0] = '<div class="mw500px"><strong>'.__('Target IP').'</strong> &nbsp;&nbsp;';
$table->data[0][0] .= html_print_input(
[
'type' => 'text',
'name' => 'target_ip',
'value' => get_parameter('target_ip', ''),
'required' => true,
'size' => 25,
'maxlength' => 0,
'return' => true,
]
);
$table->data[0][0] .= '&nbsp;&nbsp<strong>'.__('Port').'</strong>&nbsp;&nbsp;';
$table->data[0][0] .= html_print_input(
[
'type' => 'number',
'name' => 'target_port',
'id' => 'target_port',
'value' => get_parameter('target_port', 161),
'required' => true,
'return' => true,
]
);
$table->data[0][0] .= '</div>';
$table->data[0][1] = '<strong>'.__('Community').'</strong> &nbsp;&nbsp;';
$table->data[0][1] .= html_print_input_text(
'community',
get_parameter('community', ''),
'',
25,
0,
true
);
$table->data[0][2] = '<strong>'.__('Starting OID').'</strong> &nbsp;&nbsp;';
$table->data[0][2] .= html_print_input_text(
'starting_oid',
get_parameter('starting_oid', '.1.3.6.1.2.1.2.2'),
'',
25,
0,
true
$table->data[0][0] = html_print_label_input_block(
__('Target IP'),
html_print_input(
[
'type' => 'text',
'name' => 'target_ip',
'value' => get_parameter('target_ip', ''),
'required' => true,
'size' => 25,
'maxlength' => 0,
'return' => true,
]
)
);
$table->data[1][0] = '<strong>'.__('Version').'</strong> &nbsp;&nbsp;';
$table->data[1][0] .= html_print_select(
[
'1' => 'v. 1',
'2' => 'v. 2',
'2c' => 'v. 2c',
'3' => 'v. 3',
],
'snmp_browser_version',
get_parameter('snmp_browser_version', '2c'),
'checkSNMPVersion();',
'',
'',
true,
false,
false,
''
$table->data[0][1] .= html_print_label_input_block(
__('Port'),
html_print_input(
[
'type' => 'number',
'name' => 'target_port',
'id' => 'target_port',
'value' => get_parameter('target_port', 161),
'required' => true,
'return' => true,
]
)
);
$table->data[0][2] = html_print_label_input_block(
__('Community'),
html_print_input_text(
'community',
get_parameter('community', ''),
'',
25,
0,
true
)
);
$table->data[1][0] = html_print_label_input_block(
__('Starting OID'),
html_print_input_text(
'starting_oid',
get_parameter('starting_oid', '.1.3.6.1.2.1.2.2'),
'',
25,
0,
true
)
);
$table->data[1][1] = html_print_label_input_block(
__('Version'),
html_print_select(
[
'1' => 'v. 1',
'2' => 'v. 2',
'2c' => 'v. 2c',
'3' => 'v. 3',
],
'snmp_browser_version',
get_parameter('snmp_browser_version', '2c'),
'checkSNMPVersion();',
'',
'',
true,
false,
false,
'',
false,
'width: 100%',
)
);
$servers_to_exec = [];
@ -782,31 +798,22 @@ function snmp_browser_print_container(
}
}
$table->data[1][1] = '<strong>';
$table->data[1][1] .= __('Server to execute');
$table->data[1][1] .= '</strong> &nbsp;&nbsp;';
$table->data[1][1] .= html_print_select(
$servers_to_exec,
'server_to_exec',
'',
'',
'',
'',
true
);
$table->data[1][2] = html_print_input(
[
'type' => 'submit',
'label' => __('Browse'),
'name' => 'browse',
'disabled' => false,
'script' => 'snmpBrowse()',
'attributes' => 'class="sub search mrgn_top_0px"',
'return' => true,
],
'div',
true
$table->data[1][2] = html_print_label_input_block(
__('Server to execute'),
html_print_select(
$servers_to_exec,
'server_to_exec',
'',
'',
'',
'',
true,
false,
false,
'',
false,
'width: 100%',
)
);
// SNMP v3 options.
@ -819,87 +826,159 @@ function snmp_browser_print_container(
$table3 = new stdClass();
$table3->width = '100%';
$table3->class = 'filter-table-adv';
$table3->valign[0] = '';
$table3->valign[1] = '';
$table3->size[0] = '30%';
$table3->size[1] = '30%';
$table3->size[2] = '30%';
$table3->data[2][1] = '<b>'.__('Auth user').'</b>';
$table3->data[2][2] = html_print_input_text(
'snmp3_browser_auth_user',
$snmp3_auth_user,
'',
15,
60,
true
$table3->data[0][0] = html_print_label_input_block(
__('Auth user'),
html_print_input_text(
'snmp3_browser_auth_user',
$snmp3_auth_user,
'',
15,
60,
true
)
);
$table3->data[2][3] = '<b>'.__('Auth password').'</b>';
$table3->data[2][4] = html_print_input_password(
'snmp3_browser_auth_pass',
$snmp3_auth_pass,
'',
15,
60,
true
$table3->data[0][1] = html_print_label_input_block(
__('Auth password'),
'<div>'.html_print_input_password(
'snmp3_browser_auth_pass',
$snmp3_auth_pass,
'',
15,
60,
true
).'</div>'
);
$table3->data[2][4] .= html_print_input_hidden_extended(
$table3->data[0][1] .= html_print_input_hidden_extended(
'active_snmp_v3',
0,
'active_snmp_v3_fsb',
true
);
$table3->data[5][0] = '<b>'.__('Privacy method').'</b>';
$table3->data[5][1] = html_print_select(
$table3->data[0][2] = html_print_label_input_block(
__('Privacy method'),
html_print_select(
[
'DES' => __('DES'),
'AES' => __('AES'),
],
'snmp3_browser_privacy_method',
$snmp3_privacy_method,
'',
'',
'',
true
)
);
$table3->data[1][0] = html_print_label_input_block(
__('Privacy pass'),
'<div>'.html_print_input_password(
'snmp3_browser_privacy_pass',
$snmp3_privacy_pass,
'',
15,
60,
true
).'</div>'
);
$table3->data[1][1] = html_print_label_input_block(
__('Auth method'),
html_print_select(
[
'MD5' => __('MD5'),
'SHA' => __('SHA'),
],
'snmp3_browser_auth_method',
$snmp3_auth_method,
'',
'',
'',
true
)
);
$table3->data[1][2] = html_print_label_input_block(
__('Security level'),
html_print_select(
[
'noAuthNoPriv' => __('Not auth and not privacy method'),
'authNoPriv' => __('Auth and not privacy method'),
'authPriv' => __('Auth and privacy method'),
],
'snmp3_browser_security_level',
$snmp3_security_level,
'',
'',
'',
true
)
);
if (isset($snmp_version) === false) {
$snmp_version = null;
}
if ($snmp_version == 3) {
$table->data[2] = '<div id="snmp3_browser_options">';
} else {
$table->data[2] = '<div id="snmp3_browser_options" style="display: none;">';
}
$table->colspan[2][0] = 3;
$table->data[2] .= ui_toggle(
html_print_table(
$table3,
true
),
__('SNMP v3 settings'),
'',
'',
true,
true
);
$table->data[2] .= '</div>';
$searchForm = '<form onsubmit="snmpBrowse(); return false;">';
$searchForm .= html_print_table($table, true);
$searchForm .= html_print_div(
[
'DES' => __('DES'),
'AES' => __('AES'),
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Execute'),
'srcbutton',
false,
[
'mode' => 'mini',
'icon' => 'cog',
],
true
),
],
'snmp3_browser_privacy_method',
$snmp3_privacy_method,
'',
'',
'',
true
);
$table3->data[5][2] = '<b>'.__('Privacy pass').'</b>';
$table3->data[5][3] = html_print_input_password(
'snmp3_browser_privacy_pass',
$snmp3_privacy_pass,
'',
15,
60,
true
);
$searchForm .= '</form>';
$table3->data[6][0] = '<b>'.__('Auth method').'</b>';
$table3->data[6][1] = html_print_select(
[
'MD5' => __('MD5'),
'SHA' => __('SHA'),
],
'snmp3_browser_auth_method',
$snmp3_auth_method,
ui_toggle(
$searchForm,
'<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form',
'',
false,
false,
'',
'',
true
);
$table3->data[6][2] = '<b>'.__('Security level').'</b>';
$table3->data[6][3] = html_print_select(
[
'noAuthNoPriv' => __('Not auth and not privacy method'),
'authNoPriv' => __('Auth and not privacy method'),
'authPriv' => __('Auth and privacy method'),
],
'snmp3_browser_security_level',
$snmp3_security_level,
'',
'',
'',
true
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);
// Search tools.
@ -1011,34 +1090,7 @@ function snmp_browser_print_container(
$table2->data[0][2] .= '</a>';
$table2->cellstyle[0][2] = 'text-align:center;';
// This extra div that can be handled by jquery's dialog.
$output = '<div id="snmp_browser_container" style="'.$display.'">';
$output .= '<div style="text-align: left; width: '.$width.'; height: '.$height.';">';
$output .= '<div class="w100p">';
$output .= '<form onsubmit="snmpBrowse(); return false;">';
$output .= html_print_table($table, true);
$output .= '</form></div>';
if (isset($snmp_version) === false) {
$snmp_version = null;
}
if ($snmp_version == 3) {
$output .= '<div id="snmp3_browser_options">';
} else {
$output .= '<div id="snmp3_browser_options" style="display: none;">';
}
$output .= ui_toggle(
html_print_table($table3, true),
__('SNMP v3 options'),
'',
'',
true,
true
);
$output .= '</div>';
$output .= '<div class="search_options">';
$output = '<div class="search_options" id="search_options" style="display:none">';
$output .= ui_toggle(
html_print_table($table2, true),
__('Search options'),
@ -1050,7 +1102,7 @@ function snmp_browser_print_container(
$output .= '</div>';
// SNMP tree container.
$output .= '<div class="snmp_tree_container">';
$output .= '<div class="snmp_tree_container" id="snmp_tree_container" style="display:none">';
$output .= html_print_input_hidden('search_count', 0, true);
$output .= html_print_input_hidden('search_index', -1, true);

View File

@ -59,6 +59,11 @@ function snmpBrowse() {
$("#spinner").css("display", "none");
// Load the SNMP tree
$("#snmp_tree_container").show();
$("#search_options").show();
$("#button-srcbutton")
.find("div")
.removeClass("rotation");
$("#snmp_browser").html(data);
// Manage click and select events.
@ -84,7 +89,11 @@ function snmpBrowse() {
errorThrown +
"</p>";
}
$("#snmp_tree_container").show();
$("#search_options").show();
$("#button-srcbutton")
.find("div")
.removeClass("rotation");
$("#snmp_browser").html(htmlError);
}
});

View File

@ -9858,17 +9858,21 @@ div#err_msg_centralised {
.div-col {
width: 33%;
display: flex;
flex-direction: row;
align-items: center;
padding-top: 15px;
flex-direction: column;
align-items: flex-start;
}
.div-span {
width: 25%;
width: 100%;
color: #161628;
font-size: 13px;
line-height: 16px;
text-align: left;
margin-bottom: 10px;
}
.div-input {
width: 75%;
width: 90%;
}
.renew_api_token_link {
@ -10822,6 +10826,7 @@ tr.bring_next_field {
left: 250px;
display: flex;
align-items: center;
margin-left: 20px;
}
.action_buttons_right_content div {
@ -11291,3 +11296,20 @@ form#satellite_conf_edit > fieldset.full-column {
div[role="dialog"] {
z-index: 1115;
}
button[name="go"] {
margin-left: 10px;
display: inline !important;
}
.module_background_state {
mask: url(../../images/modules@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain;
margin: 0 auto;
}
.alert_background_state {
mask: url(../../images/alert@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/alert@svg.svg) no-repeat center / contain;
margin: 0 auto;
}

View File

@ -272,7 +272,7 @@ div.tree-node span {
.tree-node > .node-content > .module-action-buttons {
float: right;
min-width: 105px;
min-width: 120px;
position: relative;
/* top: 5px; */
}
@ -356,8 +356,15 @@ div#tree-controller-recipient {
.node-content .module-button {
padding: 6px;
margin-top: 2px;
}
.node-content .module-button.module-alerts {
margin: 6px;
width: 16px;
padding: 0;
float: right;
}
.node-content .module-button:hover {
/* width: 20px; */
background-color: #fff;

View File

@ -63,33 +63,35 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
$table = new StdClass();
$table->width = '100%';
$table->class = 'databox filters no-border';
$table->cellpadding = '0';
$table->cellspacing = '0';
if (defined('METACONSOLE')) {
$table->class = 'databox filters no-border';
$table->width = '100%';
$table->cellpadding = '0';
$table->cellspacing = '0';
}
$table->class = 'filter-table-adv';
$table->size = [];
$table->size[0] = '33%';
$table->size[1] = '33%';
$table->size[2] = '33%';
$table->data = [];
$table->style = [];
$table->style[0] = 'font-weight: bold;';
$table->style[1] = 'font-weight: bold;';
$table->style[2] = 'font-weight: bold;';
$table->style[3] = 'font-weight: bold;';
$table->style[4] = 'font-weight: bold;';
if (defined('METACONSOLE')) {
$table->style[0] = 'font-weight: bold;';
$table->style[1] = 'font-weight: bold;';
$table->style[2] = 'font-weight: bold;';
$table->style[3] = 'font-weight: bold;';
$table->style[4] = 'font-weight: bold;';
}
$table->data[0][0] = __('Group');
$table->data[0][1] = html_print_select_groups($config['id_user'], $access, true, 'ag_group', $id_group, '', '', '', true, false, false, '', false, '', false, false, 'id_grupo', $strict_user);
$table->data[0][0] = html_print_label_input_block(
__('Group'),
html_print_select_groups(
$config['id_user'],
$access,
true,
'ag_group',
$id_group,
'',
'',
'',
true,
false,
false,
'',
false,
'',
false,
false,
'id_grupo',
$strict_user
)
);
$alert_status_filter = [];
$alert_status_filter['all_enabled'] = __('All (Enabled)');
@ -102,32 +104,93 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
$alert_standby['1'] = __('Standby on');
$alert_standby['0'] = __('Standby off');
$table->data[0][2] = __('Status');
$table->data[0][3] = html_print_select($alert_status_filter, 'disabled', $filter, '', '', '', true);
$table->data[0][4] = __('Tags').ui_print_help_tip(__('Only it is show tags in use.'), true);
$table->data[0][1] = html_print_label_input_block(
__('Status'),
html_print_select(
$alert_status_filter,
'disabled',
$filter,
'',
'',
'',
true,
false,
true,
'',
false,
'width: 100%;'
)
);
$tags = tags_get_user_tags();
if (empty($tags)) {
$table->data[0][5] .= html_print_input_text('tags', __('No tags'), '', 20, 40, true, true);
if (empty($tags) === true) {
$callbackTag = html_print_input_text('tags', __('No tags'), '', 20, 40, true, true);
} else {
$table->data[0][5] .= html_print_select($tags, 'tag', $tag_filter, '', __('All'), '', true, false, true, '', false, 'width: 150px;');
$callbackTag = html_print_select(
$tags,
'tag',
$tag_filter,
'',
__('All'),
'',
true,
false,
true,
'',
false,
'width: 100%;'
);
}
$table->data[1][0] = __('Free text for search').ui_print_help_tip(
__('Filter by agent name, module name, template name or action name'),
true
$table->data[0][2] = html_print_label_input_block(
__('Tags').ui_print_help_tip(__('Only it is show tags in use.'), true),
$callbackTag
);
$table->data[1][1] = html_print_input_text('free_search', $free_search, '', 20, 40, true);
$table->data[1][2] = __('Standby');
$table->data[1][3] = html_print_select($alert_standby, 'standby', $filter_standby, '', __('All'), '', true);
$table->data[1][0] = html_print_label_input_block(
__('Free text for search').ui_print_help_tip(
__('Filter by agent name, module name, template name or action name'),
true
),
html_print_input_text('free_search', $free_search, '', 20, 40, true)
);
$table->data[1][1] = html_print_label_input_block(
__('Standby'),
html_print_select(
$alert_standby,
'standby',
$filter_standby,
'',
__('All'),
'',
true,
false,
true,
'',
false,
'width: 100%;'
)
);
$table->data[1][4] = __('Action');
$alert_action = alerts_get_alert_actions_filter();
$table->data[1][5] = html_print_select($alert_action, 'action', $action_filter, '', __('All'), '', true);
$table->data[1][2] = html_print_label_input_block(
__('Action'),
html_print_select(
$alert_action,
'action',
$action_filter,
'',
__('All'),
'',
true,
false,
true,
'',
false,
'width: 100%;'
)
);
$data .= html_print_table($table, true);

View File

@ -530,18 +530,18 @@ if ($agent_view_page === true) {
echo $html_content;
}
// Strict user hidden.
echo '<div id="strict_hidden" class="invisible">';
html_print_input_text('strict_user_hidden', $strict_user);
// Strict user hidden.
echo '<div id="strict_hidden" class="invisible">';
html_print_input_text('strict_user_hidden', $strict_user);
html_print_input_text('is_meta_hidden', (int) is_metaconsole());
echo '</div>';
html_print_input_text('is_meta_hidden', (int) is_metaconsole());
echo '</div>';
enterprise_hook('close_meta_frame');
enterprise_hook('close_meta_frame');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
?>
<script type="text/javascript">

View File

@ -233,9 +233,8 @@ $searchForm .= '<form method="post" action="?sec=view&sec2=operation/agentes/est
$table = new stdClass();
$table->width = '100%';
$table->size = [];
$table->size[0] = '33%';
$table->size[1] = '33%';
$table->size[2] = '33%';
$table->size[0] = '50%';
$table->size[1] = '50%';
$table->class = 'filter-table-adv';
$table->data['group'][0] = html_print_label_input_block(

View File

@ -21,111 +21,128 @@
*/
function print_filters($sec)
{
global $config;
$table = new StdClass();
$table->width = '100%';
$table->cellspacing = 0;
$table->cellpadding = 0;
$table->class = 'databox filters';
$table->rowspan = [];
$table->size = [];
$table->size[0] = '33%';
$table->size[1] = '33%';
$table->size[2] = '33%';
$table->class = 'filter-table-adv';
if ($sec === 'view') {
$table->style[0] = 'font-weight: bold;';
$table->style[1] = 'font-weight: bold;';
$table->style[2] = 'font-weight: bold;';
$table->style[3] = 'font-weight: bold;';
$table->style[4] = 'font-weight: bold;';
$table->data[0][0] = __('Group');
$table->data[0][1] .= html_print_select_groups(
$config['id_user'],
'AR',
true,
'group_id',
$ag_group,
'',
'',
'0',
true,
false,
false,
'',
false,
'',
false,
false,
'id_grupo',
false
$table->data[0][0] = html_print_label_input_block(
__('Group'),
html_print_select_groups(
$config['id_user'],
'AR',
true,
'group_id',
'',
'',
'',
'0',
true,
false,
false,
'',
false,
'',
false,
false,
'id_grupo',
false
)
);
$table->data[0][2] = __('Recursion');
$table->data[0][2] .= html_print_input(
$table->data[0][0] .= html_print_label_input_block(
__('Recursion'),
html_print_input(
[
'type' => 'switch',
'name' => 'recursion',
'return' => true,
'checked' => false,
'value' => 1,
]
),
[
'type' => 'checkbox',
'name' => 'recursion',
'return' => true,
'checked' => $recursion,
'value' => 1,
'div_class' => 'add-input-reverse',
'label_class' => 'label-thin',
]
);
$table->data[1][0] = __('Filter Agents');
$table->data[1][1] = html_print_input_text('filter_agents', '', '', 20, 255, true);
$table->data[2][0] = __('Agents');
if (empty($agents) === true || $agents == -1) {
$agents = [];
}
$table->data[2][1] = html_print_select(
[],
'selected_agents[]',
'',
'',
'',
0,
true,
true,
true,
'',
false,
'min-width: 180px; max-width: 200px;'
$table->rowspan[0][1] = 2;
$table->data[0][1] = html_print_label_input_block(
__('Agents'),
html_print_select(
[],
'selected_agents[]',
'',
'',
'',
0,
true,
true,
true,
'',
false,
'width:100%'
)
);
// Interfaces.
$table->data[2][3] = '<b>'.__('Interfaces').'</b>';
$table->data[2][4] = html_print_select(
[],
'selected_interfaces[]',
$selected_interfaces,
'',
'',
0,
true,
true,
true,
'',
false,
'min-width: 180px; max-width: 200px;'
$table->rowspan[0][2] = 2;
$table->data[0][2] = html_print_label_input_block(
__('Interfaces'),
html_print_select(
[],
'selected_interfaces[]',
'',
'',
'',
0,
true,
true,
true,
'',
false,
'width:100%'
)
);
$filters = '<form method="post" action="'.ui_get_url_refresh(
[
'selected_agents' => $selected_agents,
'selected_interfaces' => $selected_interfaces,
'selected_group_id' => $selected_group_id,
]
).'">';
$table->data[1][0] = html_print_label_input_block(
__('Filter Agents'),
html_print_input_text(
'filter_agents',
'',
'',
20,
255,
true
)
);
$filters = '<form method="post" action="'.ui_get_url_refresh().'">';
$filters .= html_print_table($table, true);
$filters .= "<div class='height_100p right'>".html_print_submit_button(
__('Show'),
'uptbutton',
false,
'class="sub search mgn_tp_0"',
$filters .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Filter'),
'srcbutton',
false,
[
'icon' => 'search',
'mode' => 'mini',
],
true
),
],
true
).'</div>';
);
$filters .= '</form>';
} else {
@ -135,7 +152,7 @@ function print_filters($sec)
$table->data[0][1] = html_print_select(
[],
'selected_interfaces[]',
$selected_interfaces,
'',
'',
'',
0,
@ -147,13 +164,7 @@ function print_filters($sec)
'min-width: 180px; max-width: 200px;'
);
$filters = '<form method="post" action="'.ui_get_url_refresh(
[
'selected_agents' => $selected_agents,
'selected_interfaces' => $selected_interfaces,
'selected_group_id' => $selected_group_id,
]
).'">';
$filters = '<form method="post" action="'.ui_get_url_refresh().'">';
$filters .= html_print_table($table, true);
@ -170,7 +181,7 @@ function print_filters($sec)
ui_toggle(
$filters,
__('Interface filter'),
'<span class="subsection_header_title">'.__('Interface filter').'</span>',
__('Interface filter'),
'ui_toggle_if_filter',
true,

View File

@ -99,7 +99,7 @@ if ($autosearch === true) {
$result = agents_get_network_interfaces($selected_agents);
}
if ($result === false) {
if ($result === false || empty($result) === true) {
$result = [];
} else {
ui_pagination(

View File

@ -542,7 +542,7 @@ if (empty($tags) === true) {
true,
'',
false,
'width: 150px;'
'width: 100%;'
);
$tagsElement .= ui_print_input_placeholder(
__('Only it is show tags in use.'),
@ -744,171 +744,203 @@ $div_custom_fields .= '</div>';
$table = new stdClass();
$tableFilter = new StdClass();
$tableFilter->width = '100%';
$tableFilter->cellspacing = 0;
$tableFilter->cellpadding = 0;
$tableFilter->size = [];
$tableFilter->size[0] = '33%';
$tableFilter->size[1] = '33%';
$tableFilter->size[2] = '33%';
$tableFilter->id = 'main_status_monitor_filter';
$tableFilter->class = 'filter_table';
$tableFilter->cellclass['inputs_second_line'][2] = 'flex flex_column wrap';
// Defined styles.
$tableFilter->style[0] = 'padding-right: 10px';
$tableFilter->style[1] = 'padding-right: 10px';
$tableFilter->style[2] = 'padding-right: 10px';
$tableFilter->class = 'filter-table-adv';
// Captions for first line.
$tableFilter->data['captions_first_line'][0] = __('Group');
$tableFilter->data['captions_first_line'][1] = __('Module group');
$tableFilter->data['captions_first_line'][2] = __('Recursion');
$tableFilter->data['captions_first_line'][3] = __('Search');
// Inputs for first line.
$tableFilter->data['inputs_first_line'][0] = html_print_select_groups(
$config['id_user'],
'AR',
true,
'ag_group',
$ag_group,
'',
'',
'0',
true,
false,
false,
'',
false,
'',
false,
false,
'id_grupo',
false,
false,
false,
false,
false,
false,
$not_condition
$tableFilter->data['first_line'][0] = html_print_label_input_block(
__('Group'),
html_print_select_groups(
$config['id_user'],
'AR',
true,
'ag_group',
$ag_group,
'',
'',
'0',
true,
false,
false,
'',
false,
'',
false,
false,
'id_grupo',
false,
false,
false,
false,
false,
false,
$not_condition
)
);
$tableFilter->data['inputs_first_line'][1] = html_print_select(
$rows_select,
'modulegroup',
$modulegroup,
'',
__($is_none),
-1,
true,
false,
true,
'',
false,
'width: 100%;'
$tableFilter->data['first_line'][0] .= html_print_label_input_block(
__('Recursion'),
html_print_checkbox_switch(
'recursion',
1,
($recursion === true || $recursion === 'true' || $recursion === '1') ? 'checked' : false,
true
),
[
'div_class' => 'add-input-reverse',
'label_class' => 'label-thin',
]
);
$tableFilter->data['inputs_first_line'][2] = html_print_checkbox_switch(
'recursion',
1,
($recursion === true || $recursion === 'true' || $recursion === '1') ? 'checked' : false,
true
$tableFilter->data['first_line'][1] = html_print_label_input_block(
__('Module group'),
html_print_select(
$rows_select,
'modulegroup',
$modulegroup,
'',
__($is_none),
-1,
true,
false,
true,
'',
false,
'width: 100%;'
)
);
$tableFilter->data['inputs_first_line'][3] = html_print_input_text(
'ag_freestring',
$ag_freestring,
'',
40,
30,
true
$tableFilter->rowspan['first_line'][2] = 3;
$tableFilter->data['first_line'][2] = html_print_label_input_block(
__('Tags'),
$tagsElement
);
// Captions for second line.
$tableFilter->data['captions_second_line'][0] = __('Monitor status');
$tableFilter->data['captions_second_line'][1] = __('Module name');
$tableFilter->data['captions_second_line'][2] = __('Tags');
// Inputs for second line.
$tableFilter->rowstyle['inputs_second_line'] = 'vertical-align: top;';
$tableFilter->data['inputs_second_line'][0] = html_print_select(
$fields,
'status',
$status,
'',
__($is_none),
-1,
true,
false,
true,
'',
false,
'width: 150px;'
$tableFilter->data['second_line'][0] = html_print_label_input_block(
__('Monitor status'),
html_print_select(
$fields,
'status',
$status,
'',
__($is_none),
-1,
true,
false,
true,
'',
false,
'width: 100%'
)
);
$tableFilter->data['inputs_second_line'][1] = html_print_autocomplete_modules(
'ag_modulename',
$ag_modulename,
false,
true,
'',
[],
true
$tableFilter->data['second_line'][1] = html_print_label_input_block(
__('Module name'),
html_print_autocomplete_modules(
'ag_modulename',
$ag_modulename,
false,
true,
'',
[],
true
)
);
$tableFilter->data['inputs_second_line'][2] = $tagsElement;
$tableFilter->data['third_line'][0] = html_print_label_input_block(
__('Search'),
html_print_input_text(
'ag_freestring',
$ag_freestring,
'',
40,
30,
true
)
);
// Advanced filter.
$tableAdvancedFilter = new StdClass();
$tableAdvancedFilter->width = '100%';
$tableAdvancedFilter->class = 'filters';
$tableAdvancedFilter->style = [];
// $tableAdvancedFilter->style[0] = 'font-weight: bold;';
$tableAdvancedFilter->cellclass['fields_advancedField_1'][4] = 'flex flex_column wrap';
$tableAdvancedFilter->rowstyle['fields_advancedField_1'] = 'vertical-align: top;';
// $tableAdvancedFilter->style[1] = 'font-weight: bold;';
$tableAdvancedFilter->data['captions_advancedField_1'][0] = '<span>'.__('Server type').'</span>';
$tableAdvancedFilter->data['captions_advancedField_1'][1] = '<span>'.__('Show monitors...').'</span>';
$tableAdvancedFilter->data['captions_advancedField_1'][2] = '<span>'.__('Min. hours in current status').'</span>';
$tableAdvancedFilter->data['captions_advancedField_1'][3] = '<span>'.__('Data type').'</span>';
$tableAdvancedFilter->data['captions_advancedField_1'][4] = '<span>'.__('Not condition').'</span>';
$tableAdvancedFilter->data['fields_advancedField_1'][0] = html_print_select($typemodules, 'moduletype', $moduletype, '', __($is_none), '', true, false, true, '', false, 'width: 150px;');
$tableAdvancedFilter->data['fields_advancedField_1'][1] = html_print_select($monitor_options, 'module_option', $module_option, '', '', '', true, false, true, '', false, 'width: 150px;');
$tableAdvancedFilter->data['fields_advancedField_1'][2] = html_print_input_text('min_hours_status', $min_hours_val, '', 12, 20, true);
$tableAdvancedFilter->data['fields_advancedField_1'][3] = html_print_select_from_sql($sqlModuleType, 'datatype', '', '', __('All'), 0, true);
$tableAdvancedFilter->data['fields_advancedField_1'][4] = html_print_div(
[
'class' => 'w120px mrgn_5px mrgn_lft_0px mrgn_right_0px flex wrap',
'content' => html_print_input(
[
'type' => 'switch',
'name' => 'not_condition',
'return' => false,
'checked' => ($check_not_condition === true || $check_not_condition === 'true' || $check_not_condition === '1') ? 'checked' : false,
'value' => 'NOT',
'id' => 'not_condition_switch',
'onclick' => 'changeNotConditionStatus(this)',
]
).ui_print_input_placeholder(__('If you check this option, those elements that do NOT meet any of the requirements will be shown'), true),
],
true
$tableAdvancedFilter->size = [];
$tableAdvancedFilter->size[0] = '33%';
$tableAdvancedFilter->size[1] = '33%';
$tableAdvancedFilter->size[2] = '33%';
$tableAdvancedFilter->data['advancedField_1'][0] = html_print_label_input_block(
__('Server type'),
html_print_select(
$typemodules,
'moduletype',
$moduletype,
'',
__($is_none),
'',
true,
false,
true,
'',
false,
'width: 100%;'
)
);
/*
'<div id="datatypebox">';
$a = db_get_all_rows_sql($sql);
$tableAdvancedFilter->data['advancedField_1'][1] = html_print_label_input_block(
__('Show monitors...'),
html_print_select(
$monitor_options,
'module_option',
$module_option,
'',
'',
'',
true,
false,
true,
'',
false,
'width: 100%;'
)
);
$tableAdvancedFilter->data[1][1] .= '<select id="datatype" name="datatype" style="height: 28px;" ';
$tableAdvancedFilter->data['advancedField_1'][2] = html_print_label_input_block(
__('Min. hours in current status'),
html_print_input_text('min_hours_status', $min_hours_val, '', 12, 20, true)
);
$tableAdvancedFilter->data[1][1] .= '>';
$tableAdvancedFilter->data['advancedField_2'][0] = html_print_label_input_block(
__('Data type'),
html_print_select_from_sql($sqlModuleType, 'datatype', '', '', __('All'), 0, true)
);
$tableAdvancedFilter->data[1][1] .= '<option name="datatype" value="">'.__($is_none).'</option>';
$tableAdvancedFilter->data['advancedField_2'][1] = html_print_label_input_block(
__('Not condition'),
html_print_div(
[
'class' => 'mrgn_5px mrgn_lft_0px mrgn_right_0px flex wrap',
'content' => html_print_input(
[
'type' => 'switch',
'name' => 'not_condition',
'return' => false,
'checked' => ($check_not_condition === true || $check_not_condition === 'true' || $check_not_condition === '1') ? 'checked' : false,
'value' => 'NOT',
'id' => 'not_condition_switch',
'onclick' => 'changeNotConditionStatus(this)',
]
).ui_print_input_placeholder(
__('If you check this option, those elements that do NOT meet any of the requirements will be shown'),
true
),
],
true
)
);
foreach ($a as $valor) {
$tableAdvancedFilter->data[1][1] .= '<option name="datatype" value="'.$valor['id_tipo'].'" ';
if ($valor['id_tipo'] == $datatype) {
$tableAdvancedFilter->data[1][1] .= 'selected';
}
$tableAdvancedFilter->data[1][1] .= '>'.$valor['descripcion'].'</option>';
}
$tableAdvancedFilter->data[1][1] .= '</select>';
$tableAdvancedFilter->data[1][1] .= '</div>';
*/
$tableAdvancedFilter->colspan[2][0] = 7;
$tableAdvancedFilter->cellstyle[2][0] = 'padding-left: 10px;';
$tableAdvancedFilter->colspan[2][0] = 3;
$tableAdvancedFilter->data[2][0] = ui_toggle(
$div_custom_fields,
__('Agent custom fields'),
@ -917,12 +949,10 @@ $tableAdvancedFilter->data[2][0] = ui_toggle(
true,
true,
'',
'white-box-content',
'white_table_graph'
'white-box-content'
);
$tableFilter->colspan[3][0] = 7;
$tableFilter->cellstyle[3][0] = 'padding-left: 10px;padding-bottom: 0px;';
$tableFilter->colspan[3][0] = 3;
$tableFilter->data[3][0] = ui_toggle(
html_print_table(
$tableAdvancedFilter,
@ -934,13 +964,23 @@ $tableFilter->data[3][0] = ui_toggle(
true,
true,
'',
'white-box-content',
'white_table_graph'
'white-box-content'
);
// $tableFilter->colspan[4][0] = 2;
$tableFilter->cellstyle[4][0] = 'padding-top: 0px;';
$tableFilter->data[4][0] = html_print_button(
$filters = '<form method="post" action="index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params.'">';
$filters .= html_print_table($tableFilter, true);
$buttons = html_print_submit_button(
__('Filter'),
'uptbutton',
false,
[
'icon' => 'search',
'mode' => 'mini',
],
true
);
$buttons .= html_print_button(
__('Load filter'),
'load-filter',
false,
@ -953,8 +993,7 @@ $tableFilter->data[4][0] = html_print_button(
true
);
$tableFilter->data[4][1] = html_print_button(
$buttons .= html_print_button(
__('Save filter'),
'save-filter',
false,
@ -967,21 +1006,14 @@ $tableFilter->data[4][1] = html_print_button(
true
);
$tableFilter->colspan[4][2] = 5;
$tableFilter->cellstyle[4][2] = 'padding-top: 0px;';
$tableFilter->data[4][2] = html_print_submit_button(
__('Filter'),
'uptbutton',
false,
$filters .= html_print_div(
[
'icon' => 'next',
'mode' => 'mini',
'class' => 'action-buttons',
'content' => $buttons,
],
true
);
$filters = '<form method="post" action="index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params.'">';
$filters .= html_print_table($tableFilter, true);
$filters .= '</form>';
ui_toggle(
$filters,
@ -2164,7 +2196,7 @@ if (is_metaconsole() !== true) {
}
// End Build List Result.
echo "<div id='monitor_details_window' class='filter_table'></div>";
echo "<div id='monitor_details_window'></div>";
// Load filter div for dialog.
echo '<div id="load-modal-filter" style="display:none"></div>';

View File

@ -199,22 +199,18 @@ if (is_metaconsole() === false) {
// --------------------- form filter -----------------------------------
$table = new StdClass();
$table->width = '100%';
$table->class = 'filter_table';
$table->cellstyle['captions_agent_row'][0] = 'width: 0';
$table->cellstyle['captions_agent_row'][1] = 'width: 200px';
$table->cellstyle['captions_agent_row'][2] = 'width: 200px';
$table->class = 'filter-table-adv';
$table->data = [];
$table->rowspan = [];
$table->size = [];
if (is_metaconsole() === true) {
$table->width = '96%';
$table->cellpadding = '0';
$table->cellspacing = '0';
$table->class = 'databox_filters';
$table->styleTable = 'padding:0px;margin-bottom:0px; ';
}
// if (is_metaconsole() === true) {
// $table->width = '96%';
// $table->cellpadding = '0';
// $table->cellspacing = '0';
// $table->class = 'databox_filters';
// $table->styleTable = 'padding:0px;margin-bottom:0px; ';
// }
// Agent filter.
$agent_status_arr = [];
$agent_status_arr[AGENT_STATUS_ALL] = __('All');
@ -225,22 +221,76 @@ $agent_status_arr[AGENT_STATUS_CRITICAL] = __('Critical');
$agent_status_arr[AGENT_STATUS_UNKNOWN] = __('Unknown');
$agent_status_arr[AGENT_STATUS_NOT_INIT] = __('Not init');
$table->data['captions_group_row'][] = __('Search group');
$table->data['inputs_group_row'][] = html_print_input_text('search_group', $search_group, '', 25, 30, true);
$table->data['group_row'][] = html_print_label_input_block(
__('Search group'),
html_print_input_text('search_group', $search_group, '', 25, 30, true)
);
if (is_metaconsole() === true) {
$table->data['captions_group_row'][] = __('Show not init modules');
$table->data['inputs_group_row'][] = html_print_checkbox('show_not_init_modules', $show_not_init_modules, true, true);
$table->data['group_row'][] = html_print_label_input_block(
__('Show not init modules'),
html_print_checkbox(
'show_not_init_modules',
$show_not_init_modules,
true,
true
)
);
}
$table->data['captions_agent_row'][] = __('Search agent');
$table->data['captions_agent_row'][] = __('Show not init agents');
$table->data['captions_agent_row'][] = __('Show full hirearchy');
$table->data['captions_agent_row'][] = __('Agent status');
$table->data['inputs_agent_row'][] = html_print_input_text('search_agent', $search_agent, '', 25, 30, true);
$table->data['inputs_agent_row'][] = html_print_checkbox_switch('show_not_init_agents', $show_not_init_agents, true, true);
$table->data['inputs_agent_row'][] = html_print_checkbox_switch('serach_hirearchy', $serach_hirearchy, false, true);
$table->data['inputs_agent_row'][] = html_print_select($agent_status_arr, 'status_agent', $status_agent, '', '', 0, true, false, true, '', false, 'width:10em').html_print_input_hidden('show_not_init_modules_hidden', $show_not_init_modules, true);
$table->data['agent_row'][] = html_print_label_input_block(
__('Search agent'),
html_print_input_text(
'search_agent',
$search_agent,
'',
25,
30,
true
)
);
$table->data['agent_row'][] = html_print_label_input_block(
__('Show not init agents'),
html_print_checkbox_switch(
'show_not_init_agents',
$show_not_init_agents,
true,
true
)
);
$table->data['agent_row'][] = html_print_label_input_block(
__('Show full hirearchy'),
html_print_checkbox_switch(
'serach_hirearchy',
$serach_hirearchy,
false,
true
)
);
$table->data['agent_row'][] = html_print_label_input_block(
__('Agent status'),
html_print_select(
$agent_status_arr,
'status_agent',
$status_agent,
'',
'',
0,
true,
false,
true,
'',
false,
'width:100%'
).html_print_input_hidden(
'show_not_init_modules_hidden',
$show_not_init_modules,
true
)
);
// Button.
if (is_metaconsole() === true) {
@ -259,17 +309,38 @@ if (is_metaconsole() === false) {
$module_status_arr[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown');
$module_status_arr[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init');
$table->data['captions_last_row'][] = __('Search module');
$table->data['inputs_last_row'][] = html_print_input_text('search_module', $search_module, '', 25, 30, true);
$table->data['last_row'][] = html_print_label_input_block(
__('Search module'),
html_print_input_text('search_module', $search_module, '', 25, 30, true)
);
$table->data['captions_last_row'][] = __('Show not init modules');
$table->data['inputs_last_row'][] = html_print_checkbox_switch('show_not_init_modules', $show_not_init_modules, true, true);
$table->data['last_row'][] = html_print_label_input_block(
__('Show not init modules'),
html_print_checkbox_switch('show_not_init_modules', $show_not_init_modules, true, true)
);
$table->data['captions_last_row'][] = __('Module status');
$table->data['inputs_last_row'][] = html_print_select($module_status_arr, 'status_module', $status_module, '', '', 0, true);
$table->data['last_row'][] = html_print_label_input_block(
__('Module status'),
html_print_select(
$module_status_arr,
'status_module',
$status_module,
'',
'',
0,
true,
false,
true,
'',
false,
'width:100%'
)
);
}
$table->data['inputs_last_row'][] = html_print_div(
$form_html = '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$tab.'&pure='.$config['pure'].'">';
$form_html .= html_print_table($table, true);
$form_html .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
@ -278,17 +349,15 @@ $table->data['inputs_last_row'][] = html_print_div(
false,
[
'icon' => 'search',
'mode' => 'secondary mini',
'mode' => 'mini',
],
true
),
],
true
);
$form_html = '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$tab.'&pure='.$config['pure'].'">';
$form_html .= html_print_table($table, true);
$form_html .= '</form>';
if (is_metaconsole() === true) {
echo "<div class='view_tree'>";
ui_toggle($form_html, '<span class="subsection_header_title">'.__('Show Options').'</span>');