Merge remote-tracking branch 'origin/develop' into fix/styles
This commit is contained in:
fbsanchez
commit
e338d5ba95
|
|
@ -298,7 +298,7 @@ function mainAgentsAlerts()
|
|||
|
||||
$table2->data[2][0] = __('Threshold');
|
||||
$table2->data[2][1] = html_print_input_text('module_action_threshold', '0', '', 5, 7, true);
|
||||
$table2->data[2][1] .= ' '.__('seconds').ui_print_help_icon('action_threshold', true);
|
||||
$table2->data[2][1] .= ' '.__('seconds');
|
||||
|
||||
$content2 = '<form class="add_alert_form" method="post">';
|
||||
$content2 .= html_print_table($table2, true);
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ ALTER TABLE `talert_commands` ADD COLUMN `fields_hidden` text;
|
|||
ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown','always','not_normal');
|
||||
|
||||
DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS incident from event';
|
||||
INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (1,'admin','Welcome to Pandora FMS Console', '&lt;p style="text-align: center; font-size: 13px;"&gt;Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -&amp;gt; Site news.&lt;/p&gt; ',NOW());
|
||||
INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (NULL,'admin','Welcome to Pandora FMS Console', '&lt;p style="text-align: center; font-size: 13px;"&gt;Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -&amp;gt; Site news.&lt;/p&gt; ',NOW());
|
||||
|
||||
|
||||
INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0);
|
||||
|
|
|
|||
|
|
@ -197,12 +197,17 @@ if (!empty($all_data)) {
|
|||
}
|
||||
|
||||
foreach ($news as $article) {
|
||||
$image = false;
|
||||
if ($article['text'] == '&lt;p style="text-align: center; font-size: 13px;"&gt;Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -&amp;gt; Site news.&lt;/p&gt; ') {
|
||||
$image = true;
|
||||
}
|
||||
|
||||
$text_bbdd = io_safe_output($article['text']);
|
||||
$text = html_entity_decode($text_bbdd);
|
||||
echo '<tr><th class="green_title">'.$article['subject'].'</th></tr>';
|
||||
echo '<tr><td>'.__('by').' <b>'.$article['author'].'</b> <i>'.ui_print_timestamp($article['timestamp'], true).'</i> '.$comparation_suffix.'</td></tr>';
|
||||
echo '<tr><td class="datos">';
|
||||
if ($article['id_news'] == 1) {
|
||||
if ($image) {
|
||||
echo '<center><img src="./images/welcome_image.png" alt="img colabora con nosotros - Support" width="191" height="207"></center>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@ function add_component_selection($id_network_component_type)
|
|||
|
||||
$data = [];
|
||||
$data[0] = __('Using module component').' ';
|
||||
$data[0] .= ui_print_help_icon('network_component', true);
|
||||
|
||||
$component_groups = network_components_get_groups($id_network_component_type);
|
||||
$data[1] = '<span id="component_group" class="left">';
|
||||
|
|
@ -384,7 +383,7 @@ if ($disabledBecauseInPolicy) {
|
|||
$table_simple->data[2][3] .= html_print_input_hidden('id_module_group', $id_module_group, true);
|
||||
}
|
||||
|
||||
$table_simple->data[3][0] = __('Dynamic Threshold Interval').' '.ui_print_help_icon('dynamic_threshold', true);
|
||||
$table_simple->data[3][0] = __('Dynamic Threshold Interval');
|
||||
$table_simple->data[3][1] = html_print_extended_select_for_time('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px', false, $classdisabledBecauseInPolicy, $disabledBecauseInPolicy);
|
||||
$table_simple->data[3][1] .= '<a onclick=advanced_option_dynamic()>'.html_print_image('images/cog.png', true, ['title' => __('Advanced options Dynamic Threshold')]).'</a>';
|
||||
if ($in_policy) {
|
||||
|
|
@ -424,7 +423,7 @@ $table_simple->data[3][2] .= html_print_input_text(
|
|||
$table_simple->data[3][3] = '<span><em>'.__('Dynamic Threshold Two Tailed: ').'</em>';
|
||||
$table_simple->data[3][3] .= html_print_checkbox('dynamic_two_tailed', 1, $dynamic_two_tailed, true, $disabledBecauseInPolicy);
|
||||
|
||||
$table_simple->data[4][0] = __('Warning status').' '.ui_print_help_icon('warning_status', true);
|
||||
$table_simple->data[4][0] = __('Warning status');
|
||||
if (!modules_is_string_type($id_module_type) || $edit) {
|
||||
$table_simple->data[4][1] .= '<span id="minmax_warning"><em>'.__('Min. ').'</em>';
|
||||
$table_simple->data[4][1] .= html_print_input_text(
|
||||
|
|
@ -477,7 +476,7 @@ if (!modules_is_string_type($id_module_type) || $edit) {
|
|||
$table_simple->data[4][2] = '<svg id="svg_dinamic" width="500" height="300"> </svg>';
|
||||
}
|
||||
|
||||
$table_simple->data[5][0] = __('Critical status').' '.ui_print_help_icon('critical_status', true);
|
||||
$table_simple->data[5][0] = __('Critical status');
|
||||
if (!modules_is_string_type($id_module_type) || $edit) {
|
||||
$table_simple->data[5][1] .= '<span id="minmax_critical"><em>'.__('Min. ').'</em>';
|
||||
$table_simple->data[5][1] .= html_print_input_text(
|
||||
|
|
@ -528,7 +527,6 @@ $table_simple->data[5][1] .= html_print_checkbox('critical_inverse', 1, $critica
|
|||
|
||||
// FF stands for Flip-flop.
|
||||
$table_simple->data[6][0] = __('FF threshold').' ';
|
||||
$table_simple->data[6][0] .= ui_print_help_icon('ff_threshold', true);
|
||||
|
||||
$table_simple->data[6][1] .= __('Keep counters');
|
||||
$table_simple->data[6][1] .= html_print_checkbox(
|
||||
|
|
@ -703,15 +701,15 @@ if ($moduletype == MODULE_DATA) {
|
|||
if (isset($id_agente)) {
|
||||
$agent_interval = agents_get_interval($id_agente);
|
||||
$interval_factor = ($interval / $agent_interval);
|
||||
$table_advanced->data[2][1] = human_time_description_raw($interval).' ('.sprintf(__('Agent interval x %s'), $interval_factor).') '.ui_print_help_icon('module_interval_factor', true);
|
||||
$table_advanced->data[2][1] = human_time_description_raw($interval).' ('.sprintf(__('Agent interval x %s'), $interval_factor).') ';
|
||||
} else {
|
||||
$table_advanced->data[2][1] = sprintf(__('Agent interval x %s'), $interval_factor).ui_print_help_icon('module_interval_factor', true);
|
||||
$table_advanced->data[2][1] = sprintf(__('Agent interval x %s'), $interval_factor);
|
||||
}
|
||||
|
||||
if ($__code_from == 'policies') {
|
||||
// If is the policy form, module_interval will store the factor (not the seconds).
|
||||
// So server will transform it to interval in seconds
|
||||
$table_advanced->data[2][1] = sprintf(__('Default').': 1', $interval_factor).ui_print_help_icon('module_interval_factor', true);
|
||||
$table_advanced->data[2][1] = sprintf(__('Default').': 1', $interval_factor);
|
||||
$table_advanced->data[2][1] .= html_print_input_hidden('module_interval', $interval_factor, true);
|
||||
} else if ($module_id_policy_module != 0) {
|
||||
$table_advanced->data[2][1] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true);
|
||||
|
|
@ -720,14 +718,14 @@ if ($moduletype == MODULE_DATA) {
|
|||
// If it is a non policy form, the module_interval will not provided and will
|
||||
// be taken the agent interval (this code is at configurar_agente.php)
|
||||
} else {
|
||||
$table_advanced->data[2][0] = __('Interval').ui_print_help_icon('module_interval', true);
|
||||
$table_advanced->data[2][0] = __('Interval');
|
||||
$table_advanced->colspan[2][1] = 2;
|
||||
$table_advanced->data[2][1] = html_print_extended_select_for_time('module_interval', $interval, '', '', '0', false, true, false, false, $classdisabledBecauseInPolicy, $disabledBecauseInPolicy);
|
||||
}
|
||||
|
||||
$table_advanced->data[2][1] .= html_print_input_hidden('moduletype', $moduletype, true);
|
||||
|
||||
$table_advanced->data[2][3] = __('Post process').' '.ui_print_help_icon('postprocess', true);
|
||||
$table_advanced->data[2][3] = __('Post process');
|
||||
$table_advanced->data[2][4] = html_print_extended_select_for_post_process(
|
||||
'post_process',
|
||||
$post_process,
|
||||
|
|
@ -793,7 +791,7 @@ $table_advanced->data[4][4] = html_print_checkbox(
|
|||
);
|
||||
$table_advanced->colspan[4][4] = 3;
|
||||
|
||||
$table_advanced->data[5][0] = __('FF interval').' '.ui_print_help_icon('ff_interval', true);
|
||||
$table_advanced->data[5][0] = __('FF interval');
|
||||
$table_advanced->data[5][1] = html_print_input_text(
|
||||
'module_ff_interval',
|
||||
$ff_interval,
|
||||
|
|
@ -808,7 +806,7 @@ $table_advanced->data[5][1] = html_print_input_text(
|
|||
).ui_print_help_tip(__('Module execution flip flop time interval (in secs).'), true);
|
||||
$table_advanced->colspan[5][1] = 2;
|
||||
|
||||
$table_advanced->data[5][3] = __('FF timeout').' '.ui_print_help_icon('ff_timeout', true);
|
||||
$table_advanced->data[5][3] = __('FF timeout');
|
||||
|
||||
$module_type_name = modules_get_type_name($id_module_type);
|
||||
$table_advanced->data[5][4] = '';
|
||||
|
|
@ -1010,7 +1008,7 @@ $table_advanced->colspan[10][1] = 6;
|
|||
if (isset($id_agente) && $moduletype == MODULE_DATA) {
|
||||
$has_remote_conf = enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']]);
|
||||
if ($has_remote_conf) {
|
||||
$table_advanced->data[11][0] = __('Cron from').ui_print_help_icon('cron', true);
|
||||
$table_advanced->data[11][0] = __('Cron from');
|
||||
$table_advanced->data[11][1] = html_print_extended_select_for_cron($hour_from, $minute_from, $mday_from, $month_from, $wday_from, true, $disabledBecauseInPolicy);
|
||||
$table_advanced->colspan[11][1] = 6;
|
||||
|
||||
|
|
@ -1018,7 +1016,7 @@ if (isset($id_agente) && $moduletype == MODULE_DATA) {
|
|||
$table_advanced->data[12][1] = html_print_extended_select_for_cron($hour_to, $minute_to, $mday_to, $month_to, $wday_to, true, $disabledBecauseInPolicy, true);
|
||||
$table_advanced->colspan[12][1] = 6;
|
||||
} else {
|
||||
$table_advanced->data[11][0] = __('Cron from').ui_print_help_icon('cron', true);
|
||||
$table_advanced->data[11][0] = __('Cron from');
|
||||
$table_advanced->data[11][1] = html_print_extended_select_for_cron($hour_from, $minute_from, $mday_from, $month_from, $wday_from, true, true);
|
||||
$table_advanced->colspan[11][1] = 6;
|
||||
|
||||
|
|
@ -1027,7 +1025,7 @@ if (isset($id_agente) && $moduletype == MODULE_DATA) {
|
|||
$table_advanced->colspan[12][1] = 6;
|
||||
}
|
||||
} else {
|
||||
$table_advanced->data[11][0] = __('Cron from').ui_print_help_icon('cron', true);
|
||||
$table_advanced->data[11][0] = __('Cron from');
|
||||
$table_advanced->data[11][1] = html_print_extended_select_for_cron($hour_from, $minute_from, $mday_from, $month_from, $wday_from, true, $disabledBecauseInPolicy);
|
||||
$table_advanced->colspan[11][1] = 6;
|
||||
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ $snmp_versions['2c'] = 'v. 2c';
|
|||
$snmp_versions['3'] = 'v. 3';
|
||||
|
||||
$data = [];
|
||||
$data[0] = __('SNMP community').ui_print_help_icon('column_macros', true);
|
||||
$data[0] = __('SNMP community');
|
||||
$adopt = false;
|
||||
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK && isset($id_agent_module)) {
|
||||
$adopt = policies_is_module_adopt($id_agent_module);
|
||||
|
|
@ -233,7 +233,7 @@ push_table_simple($data, 'snmp_2');
|
|||
|
||||
// Advanced stuff
|
||||
$data = [];
|
||||
$data[0] = __('TCP send').' '.ui_print_help_icon('tcp_send', true);
|
||||
$data[0] = __('TCP send');
|
||||
$data[1] = html_print_textarea('tcp_send', 2, 65, $tcp_send, $disabledTextBecauseInPolicy, true, $largeclassdisabledBecauseInPolicy);
|
||||
$table_simple->colspan['tcp_send'][1] = 3;
|
||||
|
||||
|
|
@ -277,7 +277,7 @@ if (!isset($id_agent_module)) {
|
|||
}
|
||||
|
||||
$data = [];
|
||||
$data[0] = __('Auth user').ui_print_help_icon('column_macros', true);
|
||||
$data[0] = __('Auth user');
|
||||
$data[1] = html_print_input_text(
|
||||
'snmp3_auth_user',
|
||||
$snmp3_auth_user,
|
||||
|
|
@ -290,7 +290,7 @@ $data[1] = html_print_input_text(
|
|||
'',
|
||||
$classdisabledBecauseInPolicy
|
||||
);
|
||||
$data[2] = __('Auth password').ui_print_help_icon('column_macros', true).ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
|
||||
$data[2] = __('Auth password').ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
|
||||
$data[3] = html_print_input_password(
|
||||
'snmp3_auth_pass',
|
||||
$snmp3_auth_pass,
|
||||
|
|
@ -312,7 +312,7 @@ push_table_simple($data, 'field_snmpv3_row1');
|
|||
$data = [];
|
||||
$data[0] = __('Privacy method');
|
||||
$data[1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true, false, false, '', $disabledBecauseInPolicy);
|
||||
$data[2] = __('Privacy pass').ui_print_help_icon('column_macros', true).ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
|
||||
$data[2] = __('Privacy pass').ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
|
||||
$data[3] = html_print_input_password(
|
||||
'snmp3_privacy_pass',
|
||||
$snmp3_privacy_pass,
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ $data[3] = html_print_input_text(
|
|||
push_table_simple($data, 'target_ip');
|
||||
|
||||
$data = [];
|
||||
$data[0] = __('Username').ui_print_help_icon('column_macros', true);
|
||||
$data[0] = __('Username');
|
||||
$data[1] = html_print_input_text(
|
||||
'plugin_user',
|
||||
$plugin_user,
|
||||
|
|
@ -73,7 +73,7 @@ $data[1] = html_print_input_text(
|
|||
'',
|
||||
$classdisabledBecauseInPolicy
|
||||
);
|
||||
$data[2] = __('Password').ui_print_help_icon('column_macros', true);
|
||||
$data[2] = __('Password');
|
||||
$data[3] = html_print_input_password(
|
||||
'plugin_pass',
|
||||
$plugin_pass,
|
||||
|
|
@ -91,7 +91,6 @@ push_table_simple($data, 'user_pass');
|
|||
|
||||
$data = [];
|
||||
$data[0] = __('WMI query');
|
||||
$data[0] .= ui_print_help_icon('wmiquery', true);
|
||||
$data[1] = html_print_input_text(
|
||||
'snmp_oid',
|
||||
$snmp_oid,
|
||||
|
|
|
|||
|
|
@ -84,9 +84,7 @@ if (is_ajax()) {
|
|||
// If the field is the number one, print the help message.
|
||||
if ($i == 1) {
|
||||
// If our context is snmpconsole, show snmp_alert helps.
|
||||
if ((isset($_SERVER['HTTP_REFERER'])) && ( preg_match('/snmp_alert/', $_SERVER['HTTP_REFERER']) > 0 )) {
|
||||
$fdesc .= ui_print_help_icon('snmp_alert_field1', true);
|
||||
} else {
|
||||
if ((!isset($_SERVER['HTTP_REFERER'])) && ( preg_match('/snmp_alert/', $_SERVER['HTTP_REFERER']) > 0 )) {
|
||||
$fdesc .= ui_print_help_icon('alert_config', true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@ if (count($actions) == 1 && isset($actions[0])) {
|
|||
$table->data[$kaction][($k + 1)] = human_time_description_raw($action_threshold, true, 'tiny');
|
||||
}
|
||||
|
||||
$table->head[($k + 1)] = __('Threshold').'<span style="float: right;">'.ui_print_help_icon('action_threshold', true, '', 'images/header_help.png').'</span>';
|
||||
$table->head[($k + 1)] = __('Threshold');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -215,7 +215,6 @@ $table->data[3][1] .= __('Number of alerts match from').' ';
|
|||
$table->data[3][1] .= html_print_input_text('fires_min', 0, '', 4, 10, true);
|
||||
$table->data[3][1] .= ' '.__('to').' ';
|
||||
$table->data[3][1] .= html_print_input_text('fires_max', 0, '', 4, 10, true);
|
||||
$table->data[3][1] .= ui_print_help_icon('alert-matches', true);
|
||||
$table->data[3][1] .= '</span>';
|
||||
|
||||
echo '<form method="post" id="form_alerts" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=add_action_alerts">';
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ echo '<form '.'action="index.php?'.'sec=gmassive&'.'sec2=godmode/massive/massive
|
|||
|
||||
echo '<fieldset id="fieldset_source">';
|
||||
echo '<legend>';
|
||||
echo '<span>'.__('Source').ui_print_help_icon('manageconfig', true).'</span>';
|
||||
echo '<span>'.__('Source');
|
||||
echo '</legend>';
|
||||
html_print_table($table);
|
||||
echo '</fieldset>';
|
||||
|
|
|
|||
|
|
@ -695,7 +695,7 @@ $table->data['edit1'][1] = '<table width="100%">';
|
|||
true
|
||||
);
|
||||
|
||||
$table->data['edit3'][0] = __('Post process').ui_print_help_icon('postprocess', true);
|
||||
$table->data['edit3'][0] = __('Post process');
|
||||
|
||||
$table->data['edit3'][1] = html_print_extended_select_for_post_process(
|
||||
'post_process',
|
||||
|
|
@ -846,10 +846,6 @@ $table->data['edit1'][1] = '<table width="100%">';
|
|||
|
||||
// FF stands for Flip-flop.
|
||||
$table->data['edit7'][0] = __('FF threshold').' ';
|
||||
$table->data['edit7'][0] .= ui_print_help_icon(
|
||||
'ff_threshold',
|
||||
true
|
||||
);
|
||||
|
||||
$table->colspan['edit7'][1] = 3;
|
||||
$table->data['edit7'][1] = __('Mode').' ';
|
||||
|
|
@ -1060,26 +1056,26 @@ $table->data['edit1'][1] = '<table width="100%">';
|
|||
true
|
||||
);
|
||||
|
||||
$table->data['edit22'][0] = __('Web checks').ui_print_help_icon('web_checks', true);
|
||||
$table->data['edit22'][0] = __('Web checks');
|
||||
;
|
||||
$table->data['edit22'][1] = '<textarea id="textarea_plugin_parameter" name="plugin_parameter_text" cols="65" rows="15"></textarea>';
|
||||
|
||||
$table->data['edit16'][2] = __('Port');
|
||||
$table->data['edit16'][3] = html_print_input_text('tcp_port', '', '', 5, 20, true);
|
||||
|
||||
$table->data['edit17'][0] = __('TCP send').' '.ui_print_help_icon('tcp_send', true);
|
||||
$table->data['edit17'][0] = __('TCP send');
|
||||
$table->data['edit17'][1] = html_print_textarea('tcp_send2', 2, 65, '', '', true);
|
||||
|
||||
$table->data['edit17'][2] = __('TCP receive');
|
||||
$table->data['edit17'][3] = html_print_textarea('tcp_rcv', 2, 65, '', '', true);
|
||||
|
||||
$table->data['edit18'][0] = __('WMI query').ui_print_help_icon('wmiquery', true);
|
||||
$table->data['edit18'][0] = __('WMI query');
|
||||
$table->data['edit18'][1] = html_print_input_text('wmi_query', '', '', 35, 255, true);
|
||||
|
||||
$table->data['edit18'][2] = __('Key string');
|
||||
$table->data['edit18'][3] = html_print_input_text('key_string', '', '', 20, 60, true);
|
||||
|
||||
$table->data['edit19'][0] = __('Field number').ui_print_help_icon('wmifield', true);
|
||||
$table->data['edit19'][0] = __('Field number');
|
||||
$table->data['edit19'][1] = html_print_input_text('field_number', '', '', 5, 15, true);
|
||||
|
||||
$table->data['edit20'][0] = __('Plugin').ui_print_help_icon('plugin_macros', true);
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ $table->data[2][1] = html_print_select(
|
|||
$table->data[2][2] = __('Interval');
|
||||
$table->data[2][3] = html_print_extended_select_for_time('module_interval', $module_interval, '', '', '0', false, true);
|
||||
|
||||
$table->data[3][0] = __('Dynamic Interval').' '.ui_print_help_icon('dynamic_threshold', true);
|
||||
$table->data[3][0] = __('Dynamic Interval');
|
||||
$table->data[3][1] = html_print_extended_select_for_time('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px', false);
|
||||
$table->data[3][1] .= '<a onclick=advanced_option_dynamic()>'.html_print_image('images/cog.png', true, ['title' => __('Advanced options Dynamic Threshold')]).'</a>';
|
||||
|
||||
|
|
@ -165,7 +165,7 @@ $table->data[3][2] .= html_print_input_text('dynamic_max', $dynamic_max, '', 10,
|
|||
$table->data[3][3] = '<span><em>'.__('Dynamic Two Tailed: ').'</em>';
|
||||
$table->data[3][3] .= html_print_checkbox('dynamic_two_tailed', 1, $dynamic_two_tailed, true);
|
||||
|
||||
$table->data[4][0] = __('Warning status').' '.ui_print_help_icon('warning_status', true);
|
||||
$table->data[4][0] = __('Warning status');
|
||||
$table->data[4][1] = '<span id="minmax_warning"><em>'.__('Min.').' </em> ';
|
||||
$table->data[4][1] .= html_print_input_text(
|
||||
'min_warning',
|
||||
|
|
@ -200,7 +200,7 @@ $table->data[4][2] = '<svg id="svg_dinamic" width="500" height="300"> </svg>';
|
|||
$table->colspan[4][2] = 2;
|
||||
$table->rowspan[4][2] = 3;
|
||||
|
||||
$table->data[5][0] = __('Critical status').' '.ui_print_help_icon('critical_status', true);
|
||||
$table->data[5][0] = __('Critical status');
|
||||
$table->data[5][1] = '<span id="minmax_critical"><em>'.__('Min.').' </em> ';
|
||||
$table->data[5][1] .= html_print_input_text(
|
||||
'min_critical',
|
||||
|
|
@ -231,7 +231,7 @@ $table->data[5][1] .= html_print_input_text(
|
|||
$table->data[5][1] .= '<br /><em>'.__('Inverse interval').'</em>';
|
||||
$table->data[5][1] .= html_print_checkbox('critical_inverse', 1, $critical_inverse, true);
|
||||
|
||||
$table->data[6][0] = __('FF threshold').' '.ui_print_help_icon('ff_threshold', true);
|
||||
$table->data[6][0] = __('FF threshold');
|
||||
$table->colspan[6][1] = 3;
|
||||
|
||||
$table->data[6][1] = __('Keep counters');
|
||||
|
|
|
|||
|
|
@ -57,16 +57,16 @@ $data = [];
|
|||
$data[0] = __('SNMP Enterprise String');
|
||||
$data[1] = html_print_input_text('snmp_oid', $snmp_oid, '', 30, 400, true);
|
||||
// $table->colspan['snmp_2'][1] = 3;
|
||||
$data[2] = __('SNMP community').ui_print_help_icon('column_macros', true);
|
||||
$data[2] = __('SNMP community');
|
||||
$data[3] = html_print_input_text('snmp_community', $snmp_community, '', 15, 60, true);
|
||||
|
||||
push_table_row($data, 'snmp_2');
|
||||
|
||||
|
||||
$data = [];
|
||||
$data[0] = __('Auth user').ui_print_help_icon('column_macros', true);
|
||||
$data[0] = __('Auth user');
|
||||
$data[1] = html_print_input_text('snmp3_auth_user', $snmp3_auth_user, '', 15, 60, true);
|
||||
$data[2] = __('Auth password').ui_print_help_icon('column_macros', true);
|
||||
$data[2] = __('Auth password');
|
||||
$data[3] = html_print_input_password('snmp3_auth_pass', $snmp3_auth_pass, '', 15, 60, true);
|
||||
$data[3] .= html_print_input_hidden_extended('active_snmp_v3', 0, 'active_snmp_v3_mncfn', true);
|
||||
push_table_row($data, 'field_snmpv3_row1');
|
||||
|
|
@ -74,7 +74,7 @@ push_table_row($data, 'field_snmpv3_row1');
|
|||
$data = [];
|
||||
$data[0] = __('Privacy method');
|
||||
$data[1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true);
|
||||
$data[2] = __('Privacy pass').ui_print_help_icon('column_macros', true);
|
||||
$data[2] = __('Privacy pass');
|
||||
$data[3] = html_print_input_password('snmp3_privacy_pass', $snmp3_privacy_pass, '', 15, 60, true);
|
||||
push_table_row($data, 'field_snmpv3_row2');
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ $data[3] = html_print_select(
|
|||
push_table_row($data, 'field_snmpv3_row3');
|
||||
|
||||
$data = [];
|
||||
$data[0] = __('Post process').' '.ui_print_help_icon('postprocess', true);
|
||||
$data[0] = __('Post process');
|
||||
$data[1] = html_print_extended_select_for_post_process(
|
||||
'post_process',
|
||||
$post_process,
|
||||
|
|
@ -117,7 +117,7 @@ push_table_row($data, 'field_process');
|
|||
|
||||
// Advanced stuff
|
||||
$data = [];
|
||||
$data[0] = __('TCP send').' '.ui_print_help_icon('tcp_send', true);
|
||||
$data[0] = __('TCP send');
|
||||
$data[1] = html_print_textarea('tcp_send', 2, 65, $tcp_send, '', true);
|
||||
$table->colspan['tcp_send'][1] = 3;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ $data[1] = html_print_select_from_sql(
|
|||
);
|
||||
// Store the macros in base64 into a hidden control to move between pages
|
||||
$data[1] .= html_print_input_hidden('macros', base64_encode($macros), true);
|
||||
$data[2] = __('Post process').' '.ui_print_help_icon('postprocess', true, ui_get_full_url(false, false, false, false));
|
||||
$data[2] = __('Post process');
|
||||
$data[3] = html_print_extended_select_for_post_process(
|
||||
'post_process',
|
||||
$post_process,
|
||||
|
|
|
|||
|
|
@ -30,29 +30,29 @@ require_once $config['homedir'].'/include/functions_modules.php';
|
|||
$data = [];
|
||||
$data[0] = __('WMI query').' '.ui_print_help_icon('wmi_query_tab', true);
|
||||
$data[1] = html_print_input_text('snmp_oid', $snmp_oid, '', 25, 255, true);
|
||||
$data[2] = __('Key string').' '.ui_print_help_icon('wmikey', true, ui_get_full_url(false, false, false, false));
|
||||
$data[2] = __('Key string');
|
||||
$data[3] = html_print_input_text('snmp_community', $snmp_community, '', 25, 255, true);
|
||||
|
||||
push_table_row($data, 'wmi_1');
|
||||
|
||||
$data = [];
|
||||
$data[0] = __('Field number').' '.ui_print_help_icon('wmifield', true, ui_get_full_url(false, false, false, false));
|
||||
$data[0] = __('Field number');
|
||||
$data[1] = html_print_input_text('tcp_port', $tcp_port, '', 5, 25, true);
|
||||
$data[2] = __('Namespace').' '.ui_print_help_icon('wminamespace', true, ui_get_full_url(false, false, false, false));
|
||||
$data[2] = __('Namespace');
|
||||
$data[3] = html_print_input_text('tcp_send', $tcp_send, '', 25, 255, true);
|
||||
|
||||
push_table_row($data, 'wmi_2');
|
||||
|
||||
$data = [];
|
||||
$data[0] = __('Username').ui_print_help_icon('column_macros', true);
|
||||
$data[0] = __('Username');
|
||||
$data[1] = html_print_input_text('plugin_user', $plugin_user, '', 15, 255, true);
|
||||
$data[2] = __('Password').ui_print_help_icon('column_macros', true);
|
||||
$data[2] = __('Password');
|
||||
$data[3] = html_print_input_password('plugin_pass', $plugin_pass, '', 25, 255, true);
|
||||
|
||||
push_table_row($data, 'wmi_3');
|
||||
|
||||
$data = [];
|
||||
$data[0] = __('Post process').' '.ui_print_help_icon('postprocess', true, ui_get_full_url(false, false, false, false));
|
||||
$data[0] = __('Post process');
|
||||
$data[1] = html_print_extended_select_for_post_process(
|
||||
'post_process',
|
||||
$post_process,
|
||||
|
|
|
|||
|
|
@ -19,10 +19,13 @@ function progress_task_list(id, title) {
|
|||
.empty()
|
||||
.dialog({
|
||||
title: title,
|
||||
draggable: true,
|
||||
autoOpen: false,
|
||||
modal: false,
|
||||
width: 600,
|
||||
height: 420,
|
||||
resizable: false,
|
||||
draggable: false,
|
||||
closeOnEscape: true,
|
||||
width: 800,
|
||||
height: 600,
|
||||
close: function() {
|
||||
if (xhr != null) xhr.abort();
|
||||
if (timeoutRef != null) clearTimeout(timeoutRef);
|
||||
|
|
|
|||
|
|
@ -597,6 +597,9 @@ sub PandoraFMS::Recon::Base::create_agents($$) {
|
|||
sub PandoraFMS::Recon::Base::create_agent($$) {
|
||||
my ($self, $device) = @_;
|
||||
|
||||
# Clean name.
|
||||
$device = clean_blank($device);
|
||||
|
||||
my @agents = get_db_rows($self->{'dbh'},
|
||||
'SELECT * FROM taddress, taddress_agent, tagente
|
||||
WHERE tagente.id_agente = taddress_agent.id_agent
|
||||
|
|
@ -732,21 +735,22 @@ sub PandoraFMS::Recon::Base::create_agent($$) {
|
|||
my $if_name = $self->snmp_get_value($device, "$PandoraFMS::Recon::Base::IFNAME.$if_index");
|
||||
$if_name = "if$if_index" unless defined ($if_name);
|
||||
$if_name =~ s/"//g;
|
||||
$if_name = clean_blank($if_name);
|
||||
|
||||
# Check whether the module already exists.
|
||||
my $module_id = get_agent_module_id($self->{'dbh'}, "${if_name}_ifOperStatus", $agent_id);
|
||||
my $module_id = get_agent_module_id($self->{'dbh'}, $if_name.'_ifOperStatus', $agent_id);
|
||||
|
||||
next if ($module_id > 0 && !$agent_learning);
|
||||
|
||||
# Encode problematic characters.
|
||||
$if_name = safe_input($if_name);
|
||||
$if_desc = safe_input($if_desc);
|
||||
|
||||
# Interface status module.
|
||||
$module_id = get_agent_module_id($self->{'dbh'}, "${if_name}_ifOperStatus", $agent_id);
|
||||
$module_id = get_agent_module_id($self->{'dbh'}, $if_name.'_ifOperStatus', $agent_id);
|
||||
if ($module_id <= 0) {
|
||||
my %module = ('id_tipo_modulo' => 18,
|
||||
'id_modulo' => 2,
|
||||
'nombre' => "${if_name}_ifOperStatus",
|
||||
'nombre' => safe_input($if_name)."_ifOperStatus",
|
||||
'descripcion' => $if_desc,
|
||||
'id_agente' => $agent_id,
|
||||
'ip_target' => $device,
|
||||
|
|
@ -781,11 +785,11 @@ sub PandoraFMS::Recon::Base::create_agent($$) {
|
|||
# Incoming traffic module.
|
||||
my $if_hc_in_octets = $self->snmp_get_value($device, "$PandoraFMS::Recon::Base::IFHCINOCTECTS.$if_index");
|
||||
if (defined($if_hc_in_octets)) {
|
||||
$module_id = get_agent_module_id($self->{'dbh'}, "${if_name}_ifHCInOctets", $agent_id);
|
||||
$module_id = get_agent_module_id($self->{'dbh'}, $if_name.'_ifHCInOctets', $agent_id);
|
||||
if ($module_id <= 0) {
|
||||
my %module = ('id_tipo_modulo' => 16,
|
||||
'id_modulo' => 2,
|
||||
'nombre' => "${if_name}_ifHCInOctets",
|
||||
'nombre' => safe_input($if_name)."_ifHCInOctets",
|
||||
'descripcion' => 'The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets.',
|
||||
'id_agente' => $agent_id,
|
||||
'ip_target' => $device,
|
||||
|
|
@ -816,11 +820,11 @@ sub PandoraFMS::Recon::Base::create_agent($$) {
|
|||
}
|
||||
# ifInOctets
|
||||
elsif (defined($self->snmp_get_value($device, "$PandoraFMS::Recon::Base::IFINOCTECTS.$if_index"))) {
|
||||
$module_id = get_agent_module_id($self->{'dbh'}, "${if_name}_ifInOctets", $agent_id);
|
||||
$module_id = get_agent_module_id($self->{'dbh'}, $if_name.'_ifInOctets', $agent_id);
|
||||
if ($module_id <= 0) {
|
||||
my %module = ('id_tipo_modulo' => 16,
|
||||
'id_modulo' => 2,
|
||||
'nombre' => "${if_name}_ifInOctets",
|
||||
'nombre' => safe_input($if_name)."_ifInOctets",
|
||||
'descripcion' => 'The total number of octets received on the interface, including framing characters.',
|
||||
'id_agente' => $agent_id,
|
||||
'ip_target' => $device,
|
||||
|
|
@ -853,11 +857,11 @@ sub PandoraFMS::Recon::Base::create_agent($$) {
|
|||
# Outgoing traffic module.
|
||||
my $if_hc_out_octets = $self->snmp_get_value($device, "$PandoraFMS::Recon::Base::IFHCOUTOCTECTS.$if_index");
|
||||
if (defined($if_hc_out_octets)) {
|
||||
$module_id = get_agent_module_id($self->{'dbh'}, "${if_name}_ifHCOutOctets", $agent_id);
|
||||
$module_id = get_agent_module_id($self->{'dbh'}, $if_name.'_ifHCOutOctets', $agent_id);
|
||||
if ($module_id <= 0) {
|
||||
my %module = ('id_tipo_modulo' => 16,
|
||||
'id_modulo' => 2,
|
||||
'nombre' => "${if_name}_ifHCOutOctets",
|
||||
'nombre' => safe_input($if_name)."_ifHCOutOctets",
|
||||
'descripcion' => 'The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifOutOctets.',
|
||||
'id_agente' => $agent_id,
|
||||
'ip_target' => $device,
|
||||
|
|
@ -893,7 +897,7 @@ sub PandoraFMS::Recon::Base::create_agent($$) {
|
|||
if ($module_id <= 0) {
|
||||
my %module = ('id_tipo_modulo' => 16,
|
||||
'id_modulo' => 2,
|
||||
'nombre' => "${if_name}_ifOutOctets",
|
||||
'nombre' => safe_input($if_name)."_ifOutOctets",
|
||||
'descripcion' => 'The total number of octets received on the interface, including framing characters.',
|
||||
'id_agente' => $agent_id,
|
||||
'ip_target' => $device,
|
||||
|
|
|
|||
Loading…
Reference in New Issue